From 816c7c873767914a1ee22f5ce3f4143db7d22db8 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Thu, 17 Apr 2014 20:34:24 +0000
Subject: quick pass at removing ability to disable sha256 and sha512. ok miod

---
 src/lib/libssl/t1_lib.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/lib/libssl/t1_lib.c')

diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 7ecf7e0658..b88b3561e0 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -334,14 +334,10 @@ tls1_ec_nid2curve_id(int nid)
 		tlsext_sigalg_ecdsa(md)
 
 static unsigned char tls12_sigalgs[] = {
-#ifndef OPENSSL_NO_SHA512
 	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
@@ -2205,14 +2201,10 @@ static tls12_lookup tls12_md[] = {
 #ifndef OPENSSL_NO_SHA
 	{NID_sha1, TLSEXT_hash_sha1},
 #endif
-#ifndef OPENSSL_NO_SHA256
 	{NID_sha224, TLSEXT_hash_sha224},
 	{NID_sha256, TLSEXT_hash_sha256},
-#endif
-#ifndef OPENSSL_NO_SHA512
 	{NID_sha384, TLSEXT_hash_sha384},
 	{NID_sha512, TLSEXT_hash_sha512}
-#endif
 };
 
 static tls12_lookup tls12_sig[] = {
@@ -2283,20 +2275,16 @@ const EVP_MD
 	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();
 
 	case TLSEXT_hash_sha512:
 		return EVP_sha512();
-#endif
 	default:
 		return NULL;
 
-- 
cgit v1.2.3-55-g6feb