diff options
| author | jsing <> | 2018-11-19 15:07:29 +0000 |
|---|---|---|
| committer | jsing <> | 2018-11-19 15:07:29 +0000 |
| commit | d56d600f3870ec2c9e54df36d801eb89a3133c94 (patch) | |
| tree | 2f98a33e540da7295b58365208c68b65db26a939 /src/lib/libssl/ssl_lib.c | |
| parent | c3a30b06a9f99ca44c239bb7aba269feaa58256e (diff) | |
| download | openbsd-d56d600f3870ec2c9e54df36d801eb89a3133c94.tar.gz openbsd-d56d600f3870ec2c9e54df36d801eb89a3133c94.tar.bz2 openbsd-d56d600f3870ec2c9e54df36d801eb89a3133c94.zip | |
Revert previous - DTLSv1 uses MD5+SHA1 for RSA signature verification.
Discussed with beck@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 { |
