summaryrefslogtreecommitdiffstats
path: root/ssl/s3_srvr.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-04-23 23:56:33 +0200
committerDr. Stephen Henson <steve@openssl.org>2012-04-23 23:56:33 +0200
commit579d553464604832911c1eb08d014f487e54e0ff (patch)
tree9a1102bb53ab75fa0f51b81605e103f70c424a89 /ssl/s3_srvr.c
parentobjxref.pl: improve portability. (diff)
downloadopenssl-579d553464604832911c1eb08d014f487e54e0ff.tar.xz
openssl-579d553464604832911c1eb08d014f487e54e0ff.zip
update NEWS
Diffstat (limited to 'ssl/s3_srvr.c')
-rw-r--r--ssl/s3_srvr.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 87678c181b..68920a72db 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1341,6 +1341,14 @@ int ssl3_get_client_hello(SSL *s)
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
goto f_err;
}
+ /* Let cert callback update server certificates if required */
+ if (s->cert->cert_cb
+ && s->cert->cert_cb(s, s->cert->cert_cb_arg) <= 0)
+ {
+ al=SSL_AD_INTERNAL_ERROR;
+ 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));