Allow for ./config no-sha0 [from stable].
authorAndy Polyakov <appro@openssl.org>
Sat, 30 Apr 2005 21:51:41 +0000 (21:51 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 30 Apr 2005 21:51:41 +0000 (21:51 +0000)
ChangeLog.0_9_7-stable_not-in-head
crypto/evp/c_alld.c
crypto/evp/m_sha.c
crypto/sha/shatest.c

index ffa9838..1b06042 100644 (file)
@@ -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:
index a935aa5..d270b0e 100644 (file)
@@ -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());
index 64b397f..e995c12 100644 (file)
@@ -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>
index d007cf1..bfb11f0 100644 (file)
 
 #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