From e6aea325b431722badc843e83c34e3213006d354 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 5 Jun 2014 17:47:16 +0000
Subject: Ensure that sess_cert is not NULL before trying to use it.

Fixes CVE-2014-3470, from OpenSSL.

ok deraadt@
---
 src/lib/libssl/s3_clnt.c         | 8 ++++++++
 src/lib/libssl/src/ssl/s3_clnt.c | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 2b538f21b4..d1455cffc1 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -2156,6 +2156,14 @@ 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
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 2b538f21b4..d1455cffc1 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -2156,6 +2156,14 @@ 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
-- 
cgit v1.2.3-55-g6feb