set ciphers to NULL before calling cert_cb
authorDr. Stephen Henson <steve@openssl.org>
Fri, 20 Jul 2012 15:21:23 +0000 (15:21 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 20 Jul 2012 15:21:23 +0000 (15:21 +0000)
ssl/s3_srvr.c

index 6cb405d..28f3bdd 100644 (file)
@@ -1357,6 +1357,7 @@ int ssl3_get_client_hello(SSL *s)
                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
                        goto f_err;
                        }
+               ciphers=NULL;
                /* Let cert callback update server certificates if required */
                if (s->cert->cert_cb
                        && s->cert->cert_cb(s, s->cert->cert_cb_arg) <= 0)
@@ -1365,7 +1366,6 @@ int ssl3_get_client_hello(SSL *s)
                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CERT_CB_ERROR);
                        goto f_err;
                        }
-               ciphers=NULL;
                c=ssl3_choose_cipher(s,s->session->ciphers,
                                     SSL_get_ciphers(s));