aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-13 11:31:00 +0100
committerMatt Caswell <matt@openssl.org>2016-04-13 21:25:24 +0100
commitd064e6ab52ac8e7b80b2a5d11b31bca583b769c7 (patch)
tree2a3471be2de81625e64fb2bb0bfdafa84fb25ccc /ssl
parent5158c763f5af973b26dd1927956ac27b6171de5c (diff)
downloadopenssl-d064e6ab52ac8e7b80b2a5d11b31bca583b769c7.tar.gz
Remove OPENSSL_NO_SHA guards
no-sha is no longer an option so remove OPENSSL_NO_SHA guards. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 593ba1d2b6..546f5d23a8 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -123,9 +123,7 @@ static void ossl_init_ssl_base(void)
#ifndef OPENSSL_NO_MD5
EVP_add_digest(EVP_md5());
EVP_add_digest_alias(SN_md5, "ssl3-md5");
-# ifndef OPENSSL_NO_SHA
EVP_add_digest(EVP_md5_sha1());
-# endif
#endif
EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
EVP_add_digest_alias(SN_sha1, "ssl3-sha1");