From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 May 2021 06:40:18 +0000 (+0200)
Subject: Rename files in providers/implementations/signatures
X-Git-Tag: openssl-3.0.0-alpha17~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a86dac8620b31b3259a8a2f609f3c9d06a1a21b;p=thirdparty%2Fopenssl.git

Rename files in providers/implementations/signatures

It was discovered that eddsa.c exist in two places, here and in
crypto/ec/curve448/, which would result in a file name clash if they
ever end up in the same library.

To mitigate, we rename the copy in providers/implementations/signatures
to have '_sig' in the file name, and do the same with all other source
files in this directory, for consistency.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15171)
---

diff --git a/providers/implementations/signature/build.info b/providers/implementations/signature/build.info
index 84c5d905b26..3df55b5eccb 100644
--- a/providers/implementations/signature/build.info
+++ b/providers/implementations/signature/build.info
@@ -6,19 +6,19 @@ $EC_GOAL=../../libimplementations.a
 $SM2SIG_GOAL=../../libimplementations.a
 
 IF[{- !$disabled{dsa} -}]
-  SOURCE[$DSA_GOAL]=dsa.c
+  SOURCE[$DSA_GOAL]=dsa_sig.c
 ENDIF
 
 IF[{- !$disabled{ec} -}]
-  SOURCE[$EC_GOAL]=eddsa.c ecdsa.c
+  SOURCE[$EC_GOAL]=eddsa_sig.c ecdsa_sig.c
 ENDIF
 
 IF[{- !$disabled{sm2} -}]
-  SOURCE[$SM2SIG_GOAL]=sm2sig.c
+  SOURCE[$SM2_GOAL]=sm2_sig.c
 ENDIF
 
-SOURCE[../../libfips.a]=rsa.c
-SOURCE[../../libnonfips.a]=rsa.c
+SOURCE[../../libfips.a]=rsa_sig.c
+SOURCE[../../libnonfips.a]=rsa_sig.c
 
 DEPEND[rsa.o]=../../common/include/prov/der_rsa.h
 DEPEND[dsa.o]=../../common/include/prov/der_dsa.h
@@ -26,5 +26,5 @@ DEPEND[ecdsa.o]=../../common/include/prov/der_ec.h
 DEPEND[eddsa.o]=../../common/include/prov/der_ecx.h
 DEPEND[sm2sig.o]=../../common/include/prov/der_sm2.h
 
-SOURCE[../../libfips.a]=mac_legacy.c
-SOURCE[../../libnonfips.a]=mac_legacy.c
+SOURCE[../../libfips.a]=mac_legacy_sig.c
+SOURCE[../../libnonfips.a]=mac_legacy_sig.c
diff --git a/providers/implementations/signature/dsa.c b/providers/implementations/signature/dsa_sig.c
similarity index 100%
rename from providers/implementations/signature/dsa.c
rename to providers/implementations/signature/dsa_sig.c
diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa_sig.c
similarity index 100%
rename from providers/implementations/signature/ecdsa.c
rename to providers/implementations/signature/ecdsa_sig.c
diff --git a/providers/implementations/signature/eddsa.c b/providers/implementations/signature/eddsa_sig.c
similarity index 100%
rename from providers/implementations/signature/eddsa.c
rename to providers/implementations/signature/eddsa_sig.c
diff --git a/providers/implementations/signature/mac_legacy.c b/providers/implementations/signature/mac_legacy_sig.c
similarity index 100%
rename from providers/implementations/signature/mac_legacy.c
rename to providers/implementations/signature/mac_legacy_sig.c
diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa_sig.c
similarity index 100%
rename from providers/implementations/signature/rsa.c
rename to providers/implementations/signature/rsa_sig.c
diff --git a/providers/implementations/signature/sm2sig.c b/providers/implementations/signature/sm2_sig.c
similarity index 100%
rename from providers/implementations/signature/sm2sig.c
rename to providers/implementations/signature/sm2_sig.c