diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index b88b3561e0..304140d7f6 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -338,9 +338,7 @@ static unsigned char tls12_sigalgs[] = { | |||
338 | tlsext_sigalg(TLSEXT_hash_sha384) | 338 | tlsext_sigalg(TLSEXT_hash_sha384) |
339 | tlsext_sigalg(TLSEXT_hash_sha256) | 339 | tlsext_sigalg(TLSEXT_hash_sha256) |
340 | tlsext_sigalg(TLSEXT_hash_sha224) | 340 | tlsext_sigalg(TLSEXT_hash_sha224) |
341 | #ifndef OPENSSL_NO_SHA | ||
342 | tlsext_sigalg(TLSEXT_hash_sha1) | 341 | tlsext_sigalg(TLSEXT_hash_sha1) |
343 | #endif | ||
344 | }; | 342 | }; |
345 | 343 | ||
346 | int | 344 | int |
@@ -2195,12 +2193,8 @@ typedef struct { | |||
2195 | } tls12_lookup; | 2193 | } tls12_lookup; |
2196 | 2194 | ||
2197 | static tls12_lookup tls12_md[] = { | 2195 | static tls12_lookup tls12_md[] = { |
2198 | #ifndef OPENSSL_NO_MD5 | ||
2199 | {NID_md5, TLSEXT_hash_md5}, | 2196 | {NID_md5, TLSEXT_hash_md5}, |
2200 | #endif | ||
2201 | #ifndef OPENSSL_NO_SHA | ||
2202 | {NID_sha1, TLSEXT_hash_sha1}, | 2197 | {NID_sha1, TLSEXT_hash_sha1}, |
2203 | #endif | ||
2204 | {NID_sha224, TLSEXT_hash_sha224}, | 2198 | {NID_sha224, TLSEXT_hash_sha224}, |
2205 | {NID_sha256, TLSEXT_hash_sha256}, | 2199 | {NID_sha256, TLSEXT_hash_sha256}, |
2206 | {NID_sha384, TLSEXT_hash_sha384}, | 2200 | {NID_sha384, TLSEXT_hash_sha384}, |
@@ -2271,10 +2265,8 @@ const EVP_MD | |||
2271 | *tls12_get_hash(unsigned char hash_alg) | 2265 | *tls12_get_hash(unsigned char hash_alg) |
2272 | { | 2266 | { |
2273 | switch (hash_alg) { | 2267 | switch (hash_alg) { |
2274 | #ifndef OPENSSL_NO_SHA | ||
2275 | case TLSEXT_hash_sha1: | 2268 | case TLSEXT_hash_sha1: |
2276 | return EVP_sha1(); | 2269 | return EVP_sha1(); |
2277 | #endif | ||
2278 | case TLSEXT_hash_sha224: | 2270 | case TLSEXT_hash_sha224: |
2279 | return EVP_sha224(); | 2271 | return EVP_sha224(); |
2280 | 2272 | ||