Commit 35b7757f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

set ciphers to NULL before calling cert_cb 

(backport from HEAD)
parent 23195e4d

ssl/s3_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -1358,6 +1358,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)
@@ -1366,7 +1367,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));