summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-29 15:00:05 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-03 16:30:37 +0100
commit8250e1b232fdd89b2b231f97ec3ed2df9c89d500 (patch)
tree111347f4920efddf26ca1a0db65bc5d3e6052a02 /ssl
parent519c977c47b30d5ca24000b146c0e0bbb360279e (diff)
Fix CVE-2014-3470
Check session_cert is not NULL before dereferencing it.
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 450d559285..83d6ede3f7 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2302,6 +2302,13 @@ int ssl3_send_client_key_exchange(SSL *s)
int ecdh_clnt_cert = 0;
int field_size = 0;
+ if (s->session->sess_cert == NULL)
+ {
+ ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
+ SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+ goto err;
+ }
+
/* Did we send out the client's
* ECDH share for use in premaster
* computation as part of client certificate?