commit c31ad0bbf8415a691dd833b29e5be66f7c4aba42
author Bernd Edlinger <bernd.edlinger@hotmail.de> Tue Jun 13 07:25:43 2017 +0200
committer Bernd Edlinger <bernd.edlinger@hotmail.de> Mon Jul 03 16:34:33 2017 +0200
tree 6683c329bda5d0acdf0294df6c262197c277c297
parent 4d89bf448490e7c77743f53bfbefbaddee9b275e

Fix a crash in tls_construct_client_certificate.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3667)

ssl/statem/statem_clnt.c

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 7ab30bd..53aa1dc 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -3320,7 +3320,12 @@
                     SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
         SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE,
                SSL_R_CANNOT_CHANGE_CIPHER);
-        goto err;
+        /*
+         * This is a fatal error, which leaves
+         * enc_write_ctx in an inconsistent state
+         * and thus ssl3_send_alert may crash.
+         */
+        return 0;
     }
 
     return 1;