diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-13 12:31:00 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 22:25:24 +0200 |
| commit | d064e6ab52ac8e7b80b2a5d11b31bca583b769c7 (patch) | |
| tree | 2a3471be2de81625e64fb2bb0bfdafa84fb25ccc | |
| parent | Remove OPENSSL_NO_AES guards (diff) | |
| download | openssl-d064e6ab52ac8e7b80b2a5d11b31bca583b769c7.tar.xz openssl-d064e6ab52ac8e7b80b2a5d11b31bca583b769c7.zip | |
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>
| -rw-r--r-- | apps/openssl.c | 3 | ||||
| -rw-r--r-- | apps/progs.h | 10 | ||||
| -rw-r--r-- | crypto/evp/m_md5_sha1.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_init.c | 2 |
4 files changed, 1 insertions, 16 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index f8ad16f685..775dc9f694 100644 --- 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 959c7a8446..267d2ceedb 100644 --- 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 ae28ddce09..6367dc7a6f 100644 --- 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 593ba1d2b6..546f5d23a8 100644 --- 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"); |