diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:51:41 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:51:41 +0000 |
| commit | 405d9761a5e023a9089bcf9ac4542deba4ab6fc2 (patch) | |
| tree | 20f220bb785283bb00000d58ce1abd0518b7ee4f | |
| parent | 4c3a2d64e43901ae954d4e6382ac7995330c6dc0 (diff) | |
| download | openssl-405d9761a5e023a9089bcf9ac4542deba4ab6fc2.tar.gz | |
Allow for ./config no-sha0 [from stable].
| -rw-r--r-- | ChangeLog.0_9_7-stable_not-in-head | 9 | ||||
| -rw-r--r-- | crypto/evp/c_alld.c | 2 | ||||
| -rw-r--r-- | crypto/evp/m_sha.c | 2 | ||||
| -rw-r--r-- | crypto/sha/shatest.c | 4 |
4 files changed, 4 insertions, 13 deletions
diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head index ffa983868b..1b06042157 100644 --- 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 a935aa565e..d270b0ee03 100644 --- 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 64b397fa03..e995c122e4 100644 --- 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 d007cf13ed..bfb11f0a5f 100644 --- 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 |