PR: 1990

[oweals/openssl.git] / crypto / evp / c_alld.c

diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 2334a28a5e33f2e4b823971c75b7bf51497b84f0..e0841d12f278fbca9783d2a79c6689a4865e4d41 100644 (file)
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -64,9 +64,6 @@
 
 void OpenSSL_add_all_digests(void)
        {
-#ifndef OPENSSL_NO_MD2
-       EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD4
        EVP_add_digest(EVP_md4());
 #endif
@@ -75,7 +72,7 @@ void OpenSSL_add_all_digests(void)
        EVP_add_digest_alias(SN_md5,"ssl2-md5");
        EVP_add_digest_alias(SN_md5,"ssl3-md5");
 #endif
-#ifndef OPENSSL_NO_SHA
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
        EVP_add_digest(EVP_sha());
 #ifndef OPENSSL_NO_DSA
        EVP_add_digest(EVP_dss());
@@ -102,5 +99,13 @@ void OpenSSL_add_all_digests(void)
        EVP_add_digest(EVP_ripemd160());
        EVP_add_digest_alias(SN_ripemd160,"ripemd");
        EVP_add_digest_alias(SN_ripemd160,"rmd160");
+#endif
+#ifndef OPENSSL_NO_SHA256
+       EVP_add_digest(EVP_sha224());
+       EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+       EVP_add_digest(EVP_sha384());
+       EVP_add_digest(EVP_sha512());
 #endif
        }