From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 1 Jul 2009 11:35:46 +0000 (+0000)
Subject: PR: 1965
X-Git-Tag: OpenSSL_1_0_0-beta3~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2f50efea38cc58b7622d8093979332b568b9f4e;p=oweals%2Fopenssl.git

PR: 1965
Submitted by: David McCullough <david_mccullough@securecomputing.com>
Approved by: steve@openssl.org

Make sure defines to remove SHA are correct.
---

diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 5032e7c2f0..aa565a652d 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -81,7 +81,7 @@ void OpenSSL_add_all_digests(void)
 	EVP_add_digest(EVP_dss());
 #endif
 #endif
-#ifndef OPENSSL_NO_SHA
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
 	EVP_add_digest(EVP_sha1());
 	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
 	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);