diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-05-29 15:00:05 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-05 13:24:30 +0100 |
| commit | e5f706590c7b1f19ca34415593aebdb6cbef355b (patch) | |
| tree | c8fd810f2dd0d6188b83fdfbfbcd7532baa6949f /ssl | |
| parent | a5d03c54ab9f14ffe709b948fe3076104845467b (diff) | |
Fix CVE-2014-3470
Check session_cert is not NULL before dereferencing it.
(cherry picked from commit 8011cd56e39a433b1837465259a9bd24a38727fb)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 12fac10d08..2cba7c8441 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -2689,6 +2689,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? |