summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c12
1 files changed, 0 insertions, 12 deletions
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)
334 tlsext_sigalg_ecdsa(md) 334 tlsext_sigalg_ecdsa(md)
335 335
336static unsigned char tls12_sigalgs[] = { 336static unsigned char tls12_sigalgs[] = {
337#ifndef OPENSSL_NO_SHA512
338 tlsext_sigalg(TLSEXT_hash_sha512) 337 tlsext_sigalg(TLSEXT_hash_sha512)
339 tlsext_sigalg(TLSEXT_hash_sha384) 338 tlsext_sigalg(TLSEXT_hash_sha384)
340#endif
341#ifndef OPENSSL_NO_SHA256
342 tlsext_sigalg(TLSEXT_hash_sha256) 339 tlsext_sigalg(TLSEXT_hash_sha256)
343 tlsext_sigalg(TLSEXT_hash_sha224) 340 tlsext_sigalg(TLSEXT_hash_sha224)
344#endif
345#ifndef OPENSSL_NO_SHA 341#ifndef OPENSSL_NO_SHA
346 tlsext_sigalg(TLSEXT_hash_sha1) 342 tlsext_sigalg(TLSEXT_hash_sha1)
347#endif 343#endif
@@ -2205,14 +2201,10 @@ static tls12_lookup tls12_md[] = {
2205#ifndef OPENSSL_NO_SHA 2201#ifndef OPENSSL_NO_SHA
2206 {NID_sha1, TLSEXT_hash_sha1}, 2202 {NID_sha1, TLSEXT_hash_sha1},
2207#endif 2203#endif
2208#ifndef OPENSSL_NO_SHA256
2209 {NID_sha224, TLSEXT_hash_sha224}, 2204 {NID_sha224, TLSEXT_hash_sha224},
2210 {NID_sha256, TLSEXT_hash_sha256}, 2205 {NID_sha256, TLSEXT_hash_sha256},
2211#endif
2212#ifndef OPENSSL_NO_SHA512
2213 {NID_sha384, TLSEXT_hash_sha384}, 2206 {NID_sha384, TLSEXT_hash_sha384},
2214 {NID_sha512, TLSEXT_hash_sha512} 2207 {NID_sha512, TLSEXT_hash_sha512}
2215#endif
2216}; 2208};
2217 2209
2218static tls12_lookup tls12_sig[] = { 2210static tls12_lookup tls12_sig[] = {
@@ -2283,20 +2275,16 @@ const EVP_MD
2283 case TLSEXT_hash_sha1: 2275 case TLSEXT_hash_sha1:
2284 return EVP_sha1(); 2276 return EVP_sha1();
2285#endif 2277#endif
2286#ifndef OPENSSL_NO_SHA256
2287 case TLSEXT_hash_sha224: 2278 case TLSEXT_hash_sha224:
2288 return EVP_sha224(); 2279 return EVP_sha224();
2289 2280
2290 case TLSEXT_hash_sha256: 2281 case TLSEXT_hash_sha256:
2291 return EVP_sha256(); 2282 return EVP_sha256();
2292#endif
2293#ifndef OPENSSL_NO_SHA512
2294 case TLSEXT_hash_sha384: 2283 case TLSEXT_hash_sha384:
2295 return EVP_sha384(); 2284 return EVP_sha384();
2296 2285
2297 case TLSEXT_hash_sha512: 2286 case TLSEXT_hash_sha512:
2298 return EVP_sha512(); 2287 return EVP_sha512();
2299#endif
2300 default: 2288 default:
2301 return NULL; 2289 return NULL;
2302 2290