commit 69877b61195198f0e4ae9fcabc53111915bed2b2
author Alex Chernyakhovsky <achernya@google.com> Sun Aug 03 15:08:29 2014 -0400
committer Adam Langley <agl@google.com> Mon Aug 04 20:13:46 2014 +0000
tree 0abd9cf3abceac04d4426c08d0506dc35cdd1850
parent f4e5c4e1062a0d337f0687849c410fa284d16e91

Remove OPENSSL_NO_SHA256

Changes were made by running

find . -type f -name *.c | xargs unifdef -m -U OPENSSL_NO_SHA256
find . -type f -name *.h | xargs unifdef -m -U OPENSSL_NO_SHA256

Change-Id: Ia2fda4b1a3a4aad286ced86cf936358fc7a30b15
Reviewed-on: https://boringssl-review.googlesource.com/1378
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_cbc.c

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index e39d488..f56f398 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -354,7 +354,6 @@
 	}
 #define LARGEST_DIGEST_CTX SHA_CTX
 
-#ifndef OPENSSL_NO_SHA256
 static void tls1_sha256_final_raw(void* ctx, unsigned char *md_out)
 	{
 	SHA256_CTX *sha256 = ctx;
@@ -367,7 +366,6 @@
 	}
 #undef  LARGEST_DIGEST_CTX
 #define LARGEST_DIGEST_CTX SHA256_CTX
-#endif
 
 #ifndef OPENSSL_NO_SHA512
 static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out)
@@ -392,10 +390,8 @@
 		{
 		case NID_md5:
 		case NID_sha1:
-#ifndef OPENSSL_NO_SHA256
 		case NID_sha224:
 		case NID_sha256:
-#endif
 #ifndef OPENSSL_NO_SHA512
 		case NID_sha384:
 		case NID_sha512:
@@ -478,7 +474,6 @@
 			md_transform = (void(*)(void *ctx, const unsigned char *block)) SHA1_Transform;
 			md_size = 20;
 			break;
-#ifndef OPENSSL_NO_SHA256
 		case NID_sha224:
 			SHA224_Init((SHA256_CTX*)md_state.c);
 			md_final_raw = tls1_sha256_final_raw;
@@ -491,7 +486,6 @@
 			md_transform = (void(*)(void *ctx, const unsigned char *block)) SHA256_Transform;
 			md_size = 32;
 			break;
-#endif
 #ifndef OPENSSL_NO_SHA512
 		case NID_sha384:
 			SHA384_Init((SHA512_CTX*)md_state.c);

ssl/s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index c2b7cad..026a0ac 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1877,11 +1877,7 @@
 	 */ 
 	EVP_Digest(CBS_data(&ticket), CBS_len(&ticket),
 			s->session->session_id, &s->session->session_id_length,
-#ifndef OPENSSL_NO_SHA256
 							EVP_sha256(), NULL);
-#else
-							EVP_sha1(), NULL);
-#endif
 	ret=1;
 	return(ret);
 f_err:

ssl/ssl_locl.h

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index e2d0850..ef3e759 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1151,11 +1151,7 @@
 int ssl_prepare_clienthello_tlsext(SSL *s);
 int ssl_prepare_serverhello_tlsext(SSL *s);
 
-#ifdef OPENSSL_NO_SHA256
-#define tlsext_tick_md	EVP_sha1
-#else
 #define tlsext_tick_md	EVP_sha256
-#endif
 int tls1_process_ticket(SSL *s, const struct ssl_early_callback_ctx *ctx,
 			SSL_SESSION **ret);
 

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 192a083..1b7e3a7 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -894,10 +894,8 @@
 	tlsext_sigalg(TLSEXT_hash_sha512)
 	tlsext_sigalg(TLSEXT_hash_sha384)
 #endif
-#ifndef OPENSSL_NO_SHA256
 	tlsext_sigalg(TLSEXT_hash_sha256)
 	tlsext_sigalg(TLSEXT_hash_sha224)
-#endif
 #ifndef OPENSSL_NO_SHA
 	tlsext_sigalg(TLSEXT_hash_sha1)
 #endif
@@ -3022,13 +3020,11 @@
 		case TLSEXT_hash_sha1:
 		return EVP_sha1();
 #endif
-#ifndef OPENSSL_NO_SHA256
 		case TLSEXT_hash_sha224:
 		return EVP_sha224();
 
 		case TLSEXT_hash_sha256:
 		return EVP_sha256();
-#endif
 #ifndef OPENSSL_NO_SHA512
 		case TLSEXT_hash_sha384:
 		return EVP_sha384();