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

Simplify calling of the OCSP callback

Browse Source 
Move all calls of the OCSP callback into one place, rather than repeating it
in two different places.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Matt Caswell 2015-12-10 10:44:30 +00:00
parent 43c34894d7
commit b1931d432f
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/statem/statem_clnt.c
View File

@ -2211,7 +2211,7 @@ MSG_PROCESS_RETURN tls_process_server_done(SSL *s, PACKET *pkt)
* |tlsext_ocsp_resplen| values will be set if we actually received a status * |tlsext_ocsp_resplen| values will be set if we actually received a status
* message, or NULL and -1 otherwise * message, or NULL and -1 otherwise
*/ */
if (s->tlsext_status_expected && s->ctx->tlsext_status_cb != NULL) { if (s->tlsext_status_type != -1 && s->ctx->tlsext_status_cb != NULL) {
int ret; int ret;
ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg); ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
if (ret == 0) { if (ret == 0) {

25
ssl/t1_lib.c
View File

@ -2847,30 +2847,13 @@ int ssl_check_serverhello_tlsext(SSL *s)
s-> s->
initial_ctx->tlsext_servername_arg); initial_ctx->tlsext_servername_arg);
/*
* Ensure we get sensible values passed to tlsext_status_cb in the event
* that we don't receive a status message
*/
OPENSSL_free(s->tlsext_ocsp_resp); OPENSSL_free(s->tlsext_ocsp_resp);
s->tlsext_ocsp_resp = NULL; s->tlsext_ocsp_resp = NULL;
s->tlsext_ocsp_resplen = -1; s->tlsext_ocsp_resplen = -1;
/*
* If we've requested certificate status and we wont get one tell the
* callback
*/
if ((s->tlsext_status_type != -1) && !(s->tlsext_status_expected)
&& !(s->hit) && s->ctx && s->ctx->tlsext_status_cb) {
int r;
/*
* Call callback with resp == NULL and resplen == -1 so callback
* knows there is no response
*/
r = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
if (r == 0) {
al = SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE;
ret = SSL_TLSEXT_ERR_ALERT_FATAL;
}
if (r < 0) {
al = SSL_AD_INTERNAL_ERROR;
ret = SSL_TLSEXT_ERR_ALERT_FATAL;
}
}
switch (ret) { switch (ret) {
case SSL_TLSEXT_ERR_ALERT_FATAL: case SSL_TLSEXT_ERR_ALERT_FATAL: