summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2018-11-16 21:20:15 +0000
committerbeck <>2018-11-16 21:20:15 +0000
commit052572f75cae4b7f97763f67d0e54e6c005dab58 (patch)
tree52e815579d38a4fd881cf3cd5a541095c554feec
parentc84617c1041e6e5bc56a7466bafe97aed7144237 (diff)
downloadopenbsd-052572f75cae4b7f97763f67d0e54e6c005dab58.tar.gz
openbsd-052572f75cae4b7f97763f67d0e54e6c005dab58.tar.bz2
openbsd-052572f75cae4b7f97763f67d0e54e6c005dab58.zip
revert previous
-rw-r--r--src/lib/libssl/ssl_clnt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 8a29a78f37..57fdbcbced 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.46 2018/11/16 21:07:20 beck Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.47 2018/11/16 21:20:15 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1533,10 +1533,7 @@ ssl3_get_server_key_exchange(SSL *s)
1533 goto f_err; 1533 goto f_err;
1534 } 1534 }
1535 } else if (pkey->type == EVP_PKEY_RSA) { 1535 } else if (pkey->type == EVP_PKEY_RSA) {
1536 if (SSL_IS_DTLS(s)) 1536 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
1537 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
1538 else
1539 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
1540 } else if (pkey->type == EVP_PKEY_EC) { 1537 } else if (pkey->type == EVP_PKEY_EC) {
1541 sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1); 1538 sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1);
1542 } else { 1539 } else {
@@ -1544,6 +1541,7 @@ ssl3_get_server_key_exchange(SSL *s)
1544 al = SSL_AD_DECODE_ERROR; 1541 al = SSL_AD_DECODE_ERROR;
1545 goto f_err; 1542 goto f_err;
1546 } 1543 }
1544 md = sigalg->md();
1547 1545
1548 if (!CBS_get_u16_length_prefixed(&cbs, &signature)) 1546 if (!CBS_get_u16_length_prefixed(&cbs, &signature))
1549 goto truncated; 1547 goto truncated;