From f39fde5c79d475a432ea62e161eedefaee537cea Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 19 Nov 2018 14:42:01 +0000
Subject: Revert previous - the default sigalg for RSA key exchange is
 {sha1,rsa}.

In TLSv1.2, if the client does not send a signature algorithms extension
then for RSA key exchange a signature algorithm of {sha1,rsa} is implied.
The MD5+SHA1 hash only applies to older versions of TLS, which do not
support sigalgs.
---
 src/lib/libssl/ssl_cert.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index e78335c5bb..313ff3ae5c 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_cert.c,v 1.71 2018/11/16 02:41:16 beck Exp $ */
+/* $OpenBSD: ssl_cert.c,v 1.72 2018/11/19 14:42:01 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -161,11 +161,11 @@ SSL_get_ex_data_X509_STORE_CTX_idx(void)
 static void
 ssl_cert_set_default_sigalgs(CERT *cert)
 {
-	/* Set digest values to legacy defaults */
+	/* Set digest values to defaults */
 	cert->pkeys[SSL_PKEY_RSA_SIGN].sigalg =
-	    ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
+	    ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
 	cert->pkeys[SSL_PKEY_RSA_ENC].sigalg =
-	    ssl_sigalg_lookup(SIGALG_RSA_PKCS1_MD5_SHA1);
+	    ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1);
 	cert->pkeys[SSL_PKEY_ECC].sigalg =
 	    ssl_sigalg_lookup(SIGALG_ECDSA_SHA1);
 #ifndef OPENSSL_NO_GOST
-- 
cgit v1.2.3-55-g6feb