Revert previous - DTLSv1 uses MD5+SHA1 for RSA signature verification.

Discussed with beck@

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 @@
-/* $OpenBSD: ssl_clnt.c,v 1.48 2018/11/17 11:22:43 beck Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.49 2018/11/19 15:07:29 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1533,10 +1533,7 @@ ssl3_get_server_key_exchange(SSL *s)
                                 goto f_err;
                         }
                 } else if (pkey->type == EVP_PKEY_RSA) {
-                        if (SSL_IS_DTLS(s))
-                                sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
-                        else
-                                sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
+                        sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
                 } else if (pkey->type == EVP_PKEY_EC) {
                         sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1);
                 } 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 @@
-/* $OpenBSD: ssl_lib.c,v 1.195 2018/11/17 11:22:43 beck Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.196 2018/11/19 15:07:29 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2209,10 +2209,7 @@ ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *cipher, const EVP_MD **pmd,
         sigalg = c->pkeys[idx].sigalg;
         if (!SSL_USE_SIGALGS(s)) {
                 if (pkey->type == EVP_PKEY_RSA) {
-                        if (SSL_IS_DTLS(s))
-                            sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
-                        else
-                            sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
+                        sigalg = ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
                 } else if (pkey->type == EVP_PKEY_EC) {
                         sigalg = ssl_sigalg_lookup(SIGALG_ECDSA_SHA1);
                 } else {