From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 29 May 2014 14:00:05 +0000 (+0100)
Subject: Fix CVE-2014-3470
X-Git-Tag: master-post-reformat~738
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5362db4603910b1bb978163e0e7dc8890727300;p=oweals%2Fopenssl.git

Fix CVE-2014-3470

Check session_cert is not NULL before dereferencing it.
(cherry picked from commit 8011cd56e39a433b1837465259a9bd24a38727fb)
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9a0b1bda8e..5fc9069006 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2712,6 +2712,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?