summaryrefslogtreecommitdiff
path: root/providers
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-05-06 08:40:18 +0200
committerRichard Levitte <levitte@openssl.org>2021-05-07 10:13:23 +0200
commit5a86dac8620b31b3259a8a2f609f3c9d06a1a21b (patch)
treeb06a1df63b840aed936e938ff304116043ddcc2e /providers
parent28a8d07d7fb8046b9efcca33a4a7a26a1591c6c7 (diff)
downloadopenssl-new-5a86dac8620b31b3259a8a2f609f3c9d06a1a21b.tar.gz
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)
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/signature/build.info14
-rw-r--r--providers/implementations/signature/dsa_sig.c (renamed from providers/implementations/signature/dsa.c)0
-rw-r--r--providers/implementations/signature/ecdsa_sig.c (renamed from providers/implementations/signature/ecdsa.c)0
-rw-r--r--providers/implementations/signature/eddsa_sig.c (renamed from providers/implementations/signature/eddsa.c)0
-rw-r--r--providers/implementations/signature/mac_legacy_sig.c (renamed from providers/implementations/signature/mac_legacy.c)0
-rw-r--r--providers/implementations/signature/rsa_sig.c (renamed from providers/implementations/signature/rsa.c)0
-rw-r--r--providers/implementations/signature/sm2_sig.c (renamed from providers/implementations/signature/sm2sig.c)0
7 files changed, 7 insertions, 7 deletions
diff --git a/providers/implementations/signature/build.info b/providers/implementations/signature/build.info
index 84c5d905b2..3df55b5ecc 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
index dde689903d..dde689903d 100644
--- a/providers/implementations/signature/dsa.c
+++ b/providers/implementations/signature/dsa_sig.c
diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa_sig.c
index 8c4648106f..8c4648106f 100644
--- a/providers/implementations/signature/ecdsa.c
+++ b/providers/implementations/signature/ecdsa_sig.c
diff --git a/providers/implementations/signature/eddsa.c b/providers/implementations/signature/eddsa_sig.c
index 148c143cc0..148c143cc0 100644
--- a/providers/implementations/signature/eddsa.c
+++ b/providers/implementations/signature/eddsa_sig.c
diff --git a/providers/implementations/signature/mac_legacy.c b/providers/implementations/signature/mac_legacy_sig.c
index a8cc67b410..a8cc67b410 100644
--- a/providers/implementations/signature/mac_legacy.c
+++ b/providers/implementations/signature/mac_legacy_sig.c
diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa_sig.c
index 16025bffc0..16025bffc0 100644
--- a/providers/implementations/signature/rsa.c
+++ b/providers/implementations/signature/rsa_sig.c
diff --git a/providers/implementations/signature/sm2sig.c b/providers/implementations/signature/sm2_sig.c
index 8607a8b911..8607a8b911 100644
--- a/providers/implementations/signature/sm2sig.c
+++ b/providers/implementations/signature/sm2_sig.c