Allow for ./config no-sha0 [from stable].

diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
index ffa983868b5d98bfd53606d45b62af48b879115f..1b06042157b111019a0c4c24e129867496283580 100644 (file)
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -248,15 +248,6 @@ be added to the end of this file.
 
        Cosmetic mingw update.  PR: 924
 
-2005-01-09 18:58  appro
-
-       Changed:
-               crypto/evp/c_alld.c (1.4.2.1), "Exp", lines: +1 -1
-               crypto/evp/m_sha.c (1.8.2.1), "Exp", lines: +1 -1
-               crypto/sha/shatest.c (1.11.2.2), "Exp", lines: +2 -2
-
-       Allow for ./config no-sha0.  PR: 993
-
 2005-03-12 10:28  appro
 
        Changed:

diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index a935aa565e65e48618969e864bf6c27451668846..d270b0ee033168fa97783d4a93c5b81bf496238a 100644 (file)
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -75,7 +75,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());

diff --git a/crypto/evp/m_sha.c b/crypto/evp/m_sha.c
index 64b397fa0302ad65c0eca9a494f7e089a1cc854e..e995c122e431670a1fcd6032ec2f4651e27a4399 100644 (file)
--- a/crypto/evp/m_sha.c
+++ b/crypto/evp/m_sha.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 
-#ifndef OPENSSL_NO_SHA
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
 
 #include <openssl/evp.h>
 #include <openssl/objects.h>

diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c
index d007cf13ede94a5b5607ca7555ec609a14cf6737..bfb11f0a5f2cf5fca08e26bcc7f720a4e0a72b7f 100644 (file)
--- a/crypto/sha/shatest.c
+++ b/crypto/sha/shatest.c
@@ -62,10 +62,10 @@
 
 #include "../e_os.h"
 
-#ifdef OPENSSL_NO_SHA
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0)
 int main(int argc, char *argv[])
 {
-    printf("No SHA support\n");
+    printf("No SHA0 support\n");
     return(0);
 }
 #else