summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorEmilia Käsper <emilia@openssl.org>2014-07-24 22:15:29 +0200
committerMatt Caswell <matt@openssl.org>2014-08-06 20:36:40 +0100
commit17160033765480453be0a41335fa6b833691c049 (patch)
treea861407c0f58f7fc0b117439f48bcf8faee7ea36 /ssl
parent280b1f1ad12131defcd986676a8fc9717aaa601b (diff)
Fix DTLS anonymous EC(DH) denial of service
CVE-2014-3510 Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_clnt.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9a94de00d8..0a006a7534 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2385,6 +2385,13 @@ int ssl3_send_client_key_exchange(SSL *s)
RSA *rsa;
unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
+ if (s->session->sess_cert == NULL)
+ {
+ /* We should always have a server certificate with SSL_kRSA. */
+ SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+ goto err;
+ }
+
if (s->session->sess_cert->peer_rsa_tmp != NULL)
rsa=s->session->sess_cert->peer_rsa_tmp;
else