mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove OPENSSL_NO_SHA guards

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

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-04-13 11:31:00 +01:00
parent 5158c763f5
commit d064e6ab52
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openssl.c
View File

@ -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

10
apps/progs.h
View File

@ -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

2
crypto/evp/m_md5_sha1.c
View File

@ -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>

2
ssl/ssl_init.c
View File

@ -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");