Commit d064e6ab authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove OPENSSL_NO_SHA guards 



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

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 5158c763

apps/openssl.c

+0 −3
Original line number Diff line number Diff line
@@ -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

apps/progs.h

+0 −10
Original line number Diff line number Diff line
@@ -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

crypto/evp/m_md5_sha1.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

ssl/ssl_init.c

+0 −2
Original line number Diff line number Diff line
@@ -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");