generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set ciphers to NULL before calling cert_cb

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-07-20 15:21:23 +00:00
parent 8e2a06bf5c
commit 050ce4ca42
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/s3_srvr.c
View File

@ -1357,6 +1357,7 @@ int ssl3_get_client_hello(SSL *s)
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED); SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
goto f_err; goto f_err;
} }
ciphers=NULL;
/* Let cert callback update server certificates if required */ /* Let cert callback update server certificates if required */
if (s->cert->cert_cb if (s->cert->cert_cb
&& s->cert->cert_cb(s, s->cert->cert_cb_arg) <= 0) && 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); SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CERT_CB_ERROR);
goto f_err; goto f_err;
} }
ciphers=NULL;
c=ssl3_choose_cipher(s,s->session->ciphers, c=ssl3_choose_cipher(s,s->session->ciphers,
SSL_get_ciphers(s)); SSL_get_ciphers(s));