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

RT3963: Allow OCSP stapling with -rev and -www

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Adam Eijdenberg
2015-07-29 21:34:35 -04:00
committed by Rich Salz
parent e46bcca25e
commit be0c03618a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/s_server.c
View File

@@ -1871,6 +1871,14 @@ int s_server_main(int argc, char *argv[])
if (ctx2) if (ctx2)
SSL_CTX_set_client_CA_list(ctx2, SSL_load_client_CA_file(CAfile)); SSL_CTX_set_client_CA_list(ctx2, SSL_load_client_CA_file(CAfile));
} }
if (s_tlsextstatus) {
SSL_CTX_set_tlsext_status_cb(ctx, cert_status_cb);
SSL_CTX_set_tlsext_status_arg(ctx, &tlscstatp);
if (ctx2) {
SSL_CTX_set_tlsext_status_cb(ctx2, cert_status_cb);
SSL_CTX_set_tlsext_status_arg(ctx2, &tlscstatp);
}
}
BIO_printf(bio_s_out, "ACCEPT\n"); BIO_printf(bio_s_out, "ACCEPT\n");
(void)BIO_flush(bio_s_out); (void)BIO_flush(bio_s_out);
@@ -1989,10 +1997,6 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
SSL_set_tlsext_debug_callback(con, tlsext_cb); SSL_set_tlsext_debug_callback(con, tlsext_cb);
SSL_set_tlsext_debug_arg(con, bio_s_out); SSL_set_tlsext_debug_arg(con, bio_s_out);
} }
if (s_tlsextstatus) {
SSL_CTX_set_tlsext_status_cb(ctx, cert_status_cb);
SSL_CTX_set_tlsext_status_arg(ctx, &tlscstatp);
}
if (context if (context
&& !SSL_set_session_id_context(con, && !SSL_set_session_id_context(con,