aboutsummaryrefslogtreecommitdiff
path: root/providers
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2019-06-05 16:01:18 +1000
committerShane Lontis <shane.lontis@oracle.com>2019-06-06 10:26:40 +1000
commit56e840fe2d7163ba07bf3ef9b8daf1d368c7696c (patch)
tree053d9c4bdc69ee2157fea9f201d2cd320d2e1cb0 /providers
parentad14e8e5085936bb495d15f4e0a1b653460ae4dd (diff)
downloadopenssl-56e840fe2d7163ba07bf3ef9b8daf1d368c7696c.zip
openssl-56e840fe2d7163ba07bf3ef9b8daf1d368c7696c.tar.gz
openssl-56e840fe2d7163ba07bf3ef9b8daf1d368c7696c.tar.bz2
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)
Diffstat (limited to 'providers')
-rw-r--r--providers/common/digests/build.info4
-rw-r--r--providers/common/digests/sha2_prov.c (renamed from providers/common/digests/sha2.c)0
-rw-r--r--providers/common/digests/sha3_prov.c (renamed from providers/common/digests/sha3.c)0
-rw-r--r--providers/default/digests/blake2_prov.c (renamed from providers/default/digests/blake2.c)0
-rw-r--r--providers/default/digests/blake2b_prov.c (renamed from providers/default/digests/blake2b.c)0
-rw-r--r--providers/default/digests/blake2s_prov.c (renamed from providers/default/digests/blake2s.c)0
-rw-r--r--providers/default/digests/build.info8
-rw-r--r--providers/default/digests/md5_prov.c (renamed from providers/default/digests/md5.c)0
-rw-r--r--providers/default/digests/md5_sha1_prov.c (renamed from providers/default/digests/md5_sha1.c)0
-rw-r--r--providers/default/digests/null_prov.c (renamed from providers/default/digests/null.c)0
-rw-r--r--providers/default/digests/sm3_prov.c (renamed from providers/default/digests/sm3.c)0
-rw-r--r--providers/legacy/digests/build.info10
-rw-r--r--providers/legacy/digests/md2_prov.c (renamed from providers/legacy/digests/md2.c)0
-rw-r--r--providers/legacy/digests/md4_prov.c (renamed from providers/legacy/digests/md4.c)0
-rw-r--r--providers/legacy/digests/mdc2_prov.c (renamed from providers/legacy/digests/mdc2.c)0
-rw-r--r--providers/legacy/digests/ripemd_prov.c (renamed from providers/legacy/digests/ripemd.c)0
-rw-r--r--providers/legacy/digests/wp_prov.c (renamed from providers/legacy/digests/wp.c)0
17 files changed, 11 insertions, 11 deletions
diff --git a/providers/common/digests/build.info b/providers/common/digests/build.info
index 8ce0b44..513da68 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
index 4b5979e..4b5979e 100644
--- a/providers/common/digests/sha2.c
+++ b/providers/common/digests/sha2_prov.c
diff --git a/providers/common/digests/sha3.c b/providers/common/digests/sha3_prov.c
index 7b898b6..7b898b6 100644
--- a/providers/common/digests/sha3.c
+++ b/providers/common/digests/sha3_prov.c
diff --git a/providers/default/digests/blake2.c b/providers/default/digests/blake2_prov.c
index 18a8d60..18a8d60 100644
--- a/providers/default/digests/blake2.c
+++ b/providers/default/digests/blake2_prov.c
diff --git a/providers/default/digests/blake2b.c b/providers/default/digests/blake2b_prov.c
index 8801270..8801270 100644
--- a/providers/default/digests/blake2b.c
+++ b/providers/default/digests/blake2b_prov.c
diff --git a/providers/default/digests/blake2s.c b/providers/default/digests/blake2s_prov.c
index a9c757e..a9c757e 100644
--- a/providers/default/digests/blake2s.c
+++ b/providers/default/digests/blake2s_prov.c
diff --git a/providers/default/digests/build.info b/providers/default/digests/build.info
index 0f15d12..637436d 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
index 81636f6..81636f6 100644
--- a/providers/default/digests/md5.c
+++ b/providers/default/digests/md5_prov.c
diff --git a/providers/default/digests/md5_sha1.c b/providers/default/digests/md5_sha1_prov.c
index 59a7df8..59a7df8 100644
--- a/providers/default/digests/md5_sha1.c
+++ b/providers/default/digests/md5_sha1_prov.c
diff --git a/providers/default/digests/null.c b/providers/default/digests/null_prov.c
index d7644f4..d7644f4 100644
--- a/providers/default/digests/null.c
+++ b/providers/default/digests/null_prov.c
diff --git a/providers/default/digests/sm3.c b/providers/default/digests/sm3_prov.c
index bd039a8..bd039a8 100644
--- a/providers/default/digests/sm3.c
+++ b/providers/default/digests/sm3_prov.c
diff --git a/providers/legacy/digests/build.info b/providers/legacy/digests/build.info
index 239efd2..538afd4 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
index edd4b78..edd4b78 100644
--- a/providers/legacy/digests/md2.c
+++ b/providers/legacy/digests/md2_prov.c
diff --git a/providers/legacy/digests/md4.c b/providers/legacy/digests/md4_prov.c
index 86937f7..86937f7 100644
--- a/providers/legacy/digests/md4.c
+++ b/providers/legacy/digests/md4_prov.c
diff --git a/providers/legacy/digests/mdc2.c b/providers/legacy/digests/mdc2_prov.c
index 75d9398..75d9398 100644
--- a/providers/legacy/digests/mdc2.c
+++ b/providers/legacy/digests/mdc2_prov.c
diff --git a/providers/legacy/digests/ripemd.c b/providers/legacy/digests/ripemd_prov.c
index 1243512..1243512 100644
--- a/providers/legacy/digests/ripemd.c
+++ b/providers/legacy/digests/ripemd_prov.c
diff --git a/providers/legacy/digests/wp.c b/providers/legacy/digests/wp_prov.c
index ece67e0..ece67e0 100644
--- a/providers/legacy/digests/wp.c
+++ b/providers/legacy/digests/wp_prov.c