2 files changed, 16 insertions, 0 deletions

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