diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-04-18 19:15:48 +0200 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-06-11 00:10:24 +0200 |
| commit | f3b355fec3b38e9f345a226d7defab146f446100 (patch) | |
| tree | 7e156254aff5d9fb27f57f7e59cb699f4c5f8bcb /ssl | |
| parent | c4ce10773fc4a8d055fe7643c83e5a1187597838 (diff) | |
Only allow a temporary rsa key exchange when they key is larger than 512.
Reviewed-by: Rich Salz <rsalz@openssl.org>
MR #838
(cherry picked from commit 57e477b9ec66542afc8c9c13ae7c4271209fb88f)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 7824e5ff8f..0879a0f8ba 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -341,7 +341,7 @@ int ssl3_connect(SSL *s) if (! (s->s3->tmp. new_cipher->algorithm_auth & (SSL_aNULL | SSL_aSRP)) -&& !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { + && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { ret = ssl3_get_server_certificate(s); if (ret <= 0) goto end; @@ -1596,6 +1596,13 @@ int ssl3_get_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR); goto err; } + + if (EVP_PKEY_bits(pkey) <= SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) { + al = SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE); + goto f_err; + } + s->session->sess_cert->peer_rsa_tmp = rsa; rsa = NULL; } |