From: Shane Lontis <shane.lontis@oracle.com>
Date: Wed, 5 Jun 2019 06:01:18 +0000 (+1000)
Subject: rename the digest provider files to avoid any name clashes with other folders
X-Git-Tag: openssl-3.0.0-alpha1~1990
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56e840fe2d7163ba07bf3ef9b8daf1d368c7696c;p=thirdparty%2Fopenssl.git

rename the digest provider files to avoid any name clashes with other folders

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9083)
---

diff --git a/providers/common/digests/build.info b/providers/common/digests/build.info
index 8ce0b443c10..513da687027 100644
--- a/providers/common/digests/build.info
+++ b/providers/common/digests/build.info
@@ -1,5 +1,5 @@
 SOURCE[../../../libcrypto]=\
-        sha2.c sha3.c
+        sha2_prov.c sha3_prov.c
 
 SOURCE[../../fips]=\
-        sha2.c sha3.c
+        sha2_prov.c sha3_prov.c
diff --git a/providers/common/digests/sha2.c b/providers/common/digests/sha2_prov.c
similarity index 100%
rename from providers/common/digests/sha2.c
rename to providers/common/digests/sha2_prov.c
diff --git a/providers/common/digests/sha3.c b/providers/common/digests/sha3_prov.c
similarity index 100%
rename from providers/common/digests/sha3.c
rename to providers/common/digests/sha3_prov.c
diff --git a/providers/default/digests/blake2.c b/providers/default/digests/blake2_prov.c
similarity index 100%
rename from providers/default/digests/blake2.c
rename to providers/default/digests/blake2_prov.c
diff --git a/providers/default/digests/blake2b.c b/providers/default/digests/blake2b_prov.c
similarity index 100%
rename from providers/default/digests/blake2b.c
rename to providers/default/digests/blake2b_prov.c
diff --git a/providers/default/digests/blake2s.c b/providers/default/digests/blake2s_prov.c
similarity index 100%
rename from providers/default/digests/blake2s.c
rename to providers/default/digests/blake2s_prov.c
diff --git a/providers/default/digests/build.info b/providers/default/digests/build.info
index 0f15d12fc73..637436d3d4b 100644
--- a/providers/default/digests/build.info
+++ b/providers/default/digests/build.info
@@ -1,17 +1,17 @@
 SOURCE[../../../libcrypto]=\
-        null.c
+        null_prov.c
 
 IF[{- !$disabled{blake2} -}]
   SOURCE[../../../libcrypto]=\
-          blake2.c blake2b.c blake2s.c
+          blake2_prov.c blake2b_prov.c blake2s_prov.c
 ENDIF
 
 IF[{- !$disabled{sm3} -}]
   SOURCE[../../../libcrypto]=\
-          sm3.c
+          sm3_prov.c
 ENDIF
 
 IF[{- !$disabled{md5} -}]
   SOURCE[../../../libcrypto]=\
-          md5.c md5_sha1.c
+          md5_prov.c md5_sha1_prov.c
 ENDIF
diff --git a/providers/default/digests/md5.c b/providers/default/digests/md5_prov.c
similarity index 100%
rename from providers/default/digests/md5.c
rename to providers/default/digests/md5_prov.c
diff --git a/providers/default/digests/md5_sha1.c b/providers/default/digests/md5_sha1_prov.c
similarity index 100%
rename from providers/default/digests/md5_sha1.c
rename to providers/default/digests/md5_sha1_prov.c
diff --git a/providers/default/digests/null.c b/providers/default/digests/null_prov.c
similarity index 100%
rename from providers/default/digests/null.c
rename to providers/default/digests/null_prov.c
diff --git a/providers/default/digests/sm3.c b/providers/default/digests/sm3_prov.c
similarity index 100%
rename from providers/default/digests/sm3.c
rename to providers/default/digests/sm3_prov.c
diff --git a/providers/legacy/digests/build.info b/providers/legacy/digests/build.info
index 239efd2114d..538afd4c075 100644
--- a/providers/legacy/digests/build.info
+++ b/providers/legacy/digests/build.info
@@ -1,24 +1,24 @@
 IF[{- !$disabled{md2} -}]
   SOURCE[../../legacy]=\
-          md2.c
+          md2_prov.c
 ENDIF
 
 IF[{- !$disabled{md4} -}]
   SOURCE[../../legacy]=\
-          md4.c
+          md4_prov.c
 ENDIF
 
 IF[{- !$disabled{mdc2} -}]
   SOURCE[../../legacy]=\
-          mdc2.c
+          mdc2_prov.c
 ENDIF
 
 IF[{- !$disabled{whirlpool} -}]
   SOURCE[../../legacy]=\
-          wp.c
+          wp_prov.c
 ENDIF
 
 IF[{- !$disabled{rmd160} -}]
   SOURCE[../../legacy]=\
-          ripemd.c
+          ripemd_prov.c
 ENDIF
\ No newline at end of file
diff --git a/providers/legacy/digests/md2.c b/providers/legacy/digests/md2_prov.c
similarity index 100%
rename from providers/legacy/digests/md2.c
rename to providers/legacy/digests/md2_prov.c
diff --git a/providers/legacy/digests/md4.c b/providers/legacy/digests/md4_prov.c
similarity index 100%
rename from providers/legacy/digests/md4.c
rename to providers/legacy/digests/md4_prov.c
diff --git a/providers/legacy/digests/mdc2.c b/providers/legacy/digests/mdc2_prov.c
similarity index 100%
rename from providers/legacy/digests/mdc2.c
rename to providers/legacy/digests/mdc2_prov.c
diff --git a/providers/legacy/digests/ripemd.c b/providers/legacy/digests/ripemd_prov.c
similarity index 100%
rename from providers/legacy/digests/ripemd.c
rename to providers/legacy/digests/ripemd_prov.c
diff --git a/providers/legacy/digests/wp.c b/providers/legacy/digests/wp_prov.c
similarity index 100%
rename from providers/legacy/digests/wp.c
rename to providers/legacy/digests/wp_prov.c