From 052572f75cae4b7f97763f67d0e54e6c005dab58 Mon Sep 17 00:00:00 2001 From: beck <> Date: Fri, 16 Nov 2018 21:20:15 +0000 Subject: revert previous --- src/lib/libssl/ssl_clnt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/libssl/ssl_clnt.c') 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 @@ -/* $OpenBSD: ssl_clnt.c,v 1.46 2018/11/16 21:07:20 beck Exp $ */ +/* $OpenBSD: ssl_clnt.c,v 1.47 2018/11/16 21:20:15 beck 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 { @@ -1544,6 +1541,7 @@ ssl3_get_server_key_exchange(SSL *s) al = SSL_AD_DECODE_ERROR; goto f_err; } + md = sigalg->md(); if (!CBS_get_u16_length_prefixed(&cbs, &signature)) goto truncated; -- cgit v1.2.3-55-g6feb