summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/ssl_clnt.c7
-rw-r--r--src/lib/libssl/ssl_lib.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 00bccf0571..35df70f2f0 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.48 2018/11/17 11:22:43 beck Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.49 2018/11/19 15:07:29 jsing 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 {
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 4ed6a95414..37db478b05 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.195 2018/11/17 11:22:43 beck Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.196 2018/11/19 15:07:29 jsing 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 *
@@ -2209,10 +2209,7 @@ ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *cipher, const EVP_MD **pmd,
2209 sigalg = c->pkeys[idx].sigalg; 2209 sigalg = c->pkeys[idx].sigalg;
2210 if (!SSL_USE_SIGALGS(s)) { 2210 if (!SSL_USE_SIGALGS(s)) {
2211 if (pkey->type == EVP_PKEY_RSA) { 2211 if (pkey->type == EVP_PKEY_RSA) {
2212 if (SSL_IS_DTLS(s)) 2212 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
2213 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
2214 else
2215 sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
2216 } else if (pkey->type == EVP_PKEY_EC) { 2213 } else if (pkey->type == EVP_PKEY_EC) {
2217 sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1); 2214 sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1);
2218 } else { 2215 } else {