diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 1424eab6e6..b15465d550 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -364,11 +364,7 @@ tls1_ec_nid2curve_id(int nid) | |||
364 | 364 | ||
365 | #define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa, | 365 | #define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa, |
366 | 366 | ||
367 | #ifdef OPENSSL_NO_ECDSA | ||
368 | #define tlsext_sigalg_ecdsa(md) /* */ | ||
369 | #else | ||
370 | #define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa, | 367 | #define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa, |
371 | #endif | ||
372 | 368 | ||
373 | #define tlsext_sigalg(md) \ | 369 | #define tlsext_sigalg(md) \ |
374 | tlsext_sigalg_rsa(md) \ | 370 | tlsext_sigalg_rsa(md) \ |
@@ -2221,9 +2217,7 @@ static tls12_lookup tls12_md[] = { | |||
2221 | static tls12_lookup tls12_sig[] = { | 2217 | static tls12_lookup tls12_sig[] = { |
2222 | {EVP_PKEY_RSA, TLSEXT_signature_rsa}, | 2218 | {EVP_PKEY_RSA, TLSEXT_signature_rsa}, |
2223 | {EVP_PKEY_DSA, TLSEXT_signature_dsa}, | 2219 | {EVP_PKEY_DSA, TLSEXT_signature_dsa}, |
2224 | #ifndef OPENSSL_NO_ECDSA | ||
2225 | {EVP_PKEY_EC, TLSEXT_signature_ecdsa} | 2220 | {EVP_PKEY_EC, TLSEXT_signature_ecdsa} |
2226 | #endif | ||
2227 | }; | 2221 | }; |
2228 | 2222 | ||
2229 | static int | 2223 | static int |
@@ -2324,11 +2318,9 @@ tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) | |||
2324 | case TLSEXT_signature_dsa: | 2318 | case TLSEXT_signature_dsa: |
2325 | idx = SSL_PKEY_DSA_SIGN; | 2319 | idx = SSL_PKEY_DSA_SIGN; |
2326 | break; | 2320 | break; |
2327 | #ifndef OPENSSL_NO_ECDSA | ||
2328 | case TLSEXT_signature_ecdsa: | 2321 | case TLSEXT_signature_ecdsa: |
2329 | idx = SSL_PKEY_ECC; | 2322 | idx = SSL_PKEY_ECC; |
2330 | break; | 2323 | break; |
2331 | #endif | ||
2332 | default: | 2324 | default: |
2333 | continue; | 2325 | continue; |
2334 | } | 2326 | } |
@@ -2353,10 +2345,8 @@ tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) | |||
2353 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1(); | 2345 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1(); |
2354 | c->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1(); | 2346 | c->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1(); |
2355 | } | 2347 | } |
2356 | #ifndef OPENSSL_NO_ECDSA | ||
2357 | if (!c->pkeys[SSL_PKEY_ECC].digest) | 2348 | if (!c->pkeys[SSL_PKEY_ECC].digest) |
2358 | c->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); | 2349 | c->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); |
2359 | #endif | ||
2360 | return 1; | 2350 | return 1; |
2361 | } | 2351 | } |
2362 | 2352 | ||