diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2018-11-16 21:20:16 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2018-11-16 21:20:16 +0000 |
| commit | 7be8be175fdc183a5b478c77c54d764afac94e32 (patch) | |
| tree | 712c7d79ff3d6625c445f194ac07d5ae098c3788 /lib/libssl | |
| parent | 4ed018dcfe811de635d3c7204d047764444863cb (diff) | |
revert previous
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/ssl_clnt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libssl/ssl_clnt.c b/lib/libssl/ssl_clnt.c index 8a29a78f376..57fdbcbced2 100644 --- a/lib/libssl/ssl_clnt.c +++ b/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; |