Remove OPENSSL_NO_SHA guards

no-sha is no longer an option so remove OPENSSL_NO_SHA guards.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/apps/openssl.c b/apps/openssl.c
index f8ad16f6857b2065f1b7ca033ece7dcfc9cae30e..775dc9f6941bfcd376aaae780cb72ddc4c0f2062 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -755,9 +755,6 @@ static void list_disabled(void)
 #ifdef OPENSSL_NO_SEED
     BIO_puts(bio_out, "SEED\n");
 #endif
-#ifdef OPENSSL_NO_SHA
-    BIO_puts(bio_out, "SHA\n");
-#endif
 #ifdef OPENSSL_NO_SOCK
     BIO_puts(bio_out, "SOCK\n");
 #endif

diff --git a/apps/progs.h b/apps/progs.h
index 959c7a84468a2f5a8403f0165b13ab5c90205dd6..267d2ceedb97c95873cedcc9f2b2c14ac09626c9 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -221,21 +221,11 @@ static FUNCTION functions[] = {
 #ifndef OPENSSL_NO_GOST
     { FT_md, "gost", dgst_main},
 #endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha1", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha224", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha256", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha384", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha512", dgst_main},
-#endif
 #ifndef OPENSSL_NO_MDC2
     { FT_md, "mdc2", dgst_main},
 #endif

diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c
index ae28ddce09a0f19d6b9e59e38805b12f79ff4a2e..6367dc7a6f5c35574306db559b79398db937eb63 100644 (file)
--- a/crypto/evp/m_md5_sha1.c
+++ b/crypto/evp/m_md5_sha1.c
@@ -51,7 +51,7 @@
  * ====================================================================
  */
 
-#if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_SHA1)
+#if !defined(OPENSSL_NO_MD5)
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>

diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 593ba1d2b66f1c8140aa7e70cfba001faaa4e6be..546f5d23a89f958d95b4d5006441345b26d9929d 100644 (file)
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -123,9 +123,7 @@ static void ossl_init_ssl_base(void)
 #ifndef OPENSSL_NO_MD5
     EVP_add_digest(EVP_md5());
     EVP_add_digest_alias(SN_md5, "ssl3-md5");
-# ifndef OPENSSL_NO_SHA
     EVP_add_digest(EVP_md5_sha1());
-# endif
 #endif
     EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
     EVP_add_digest_alias(SN_sha1, "ssl3-sha1");