From 56e840fe2d7163ba07bf3ef9b8daf1d368c7696c Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Wed, 5 Jun 2019 16:01:18 +1000 Subject: [PATCH] rename the digest provider files to avoid any name clashes with other folders Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9083) --- providers/common/digests/build.info | 4 ++-- providers/common/digests/{sha2.c => sha2_prov.c} | 0 providers/common/digests/{sha3.c => sha3_prov.c} | 0 providers/default/digests/{blake2.c => blake2_prov.c} | 0 .../default/digests/{blake2b.c => blake2b_prov.c} | 0 .../default/digests/{blake2s.c => blake2s_prov.c} | 0 providers/default/digests/build.info | 8 ++++---- providers/default/digests/{md5.c => md5_prov.c} | 0 .../default/digests/{md5_sha1.c => md5_sha1_prov.c} | 0 providers/default/digests/{null.c => null_prov.c} | 0 providers/default/digests/{sm3.c => sm3_prov.c} | 0 providers/legacy/digests/build.info | 10 +++++----- providers/legacy/digests/{md2.c => md2_prov.c} | 0 providers/legacy/digests/{md4.c => md4_prov.c} | 0 providers/legacy/digests/{mdc2.c => mdc2_prov.c} | 0 providers/legacy/digests/{ripemd.c => ripemd_prov.c} | 0 providers/legacy/digests/{wp.c => wp_prov.c} | 0 17 files changed, 11 insertions(+), 11 deletions(-) rename providers/common/digests/{sha2.c => sha2_prov.c} (100%) rename providers/common/digests/{sha3.c => sha3_prov.c} (100%) rename providers/default/digests/{blake2.c => blake2_prov.c} (100%) rename providers/default/digests/{blake2b.c => blake2b_prov.c} (100%) rename providers/default/digests/{blake2s.c => blake2s_prov.c} (100%) rename providers/default/digests/{md5.c => md5_prov.c} (100%) rename providers/default/digests/{md5_sha1.c => md5_sha1_prov.c} (100%) rename providers/default/digests/{null.c => null_prov.c} (100%) rename providers/default/digests/{sm3.c => sm3_prov.c} (100%) rename providers/legacy/digests/{md2.c => md2_prov.c} (100%) rename providers/legacy/digests/{md4.c => md4_prov.c} (100%) rename providers/legacy/digests/{mdc2.c => mdc2_prov.c} (100%) rename providers/legacy/digests/{ripemd.c => ripemd_prov.c} (100%) rename providers/legacy/digests/{wp.c => wp_prov.c} (100%) diff --git a/providers/common/digests/build.info b/providers/common/digests/build.info index 8ce0b443c1..513da68702 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 0f15d12fc7..637436d3d4 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 239efd2114..538afd4c07 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 -- 2.34.1