Commit be0c0361 authored by Adam Eijdenberg's avatar Adam Eijdenberg Committed by Rich Salz
Browse files

RT3963: Allow OCSP stapling with -rev and -www 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent e46bcca2

apps/s_server.c

+8 −4
Original line number Diff line number Diff line
@@ -1871,6 +1871,14 @@ int s_server_main(int argc, char *argv[]) 
        if (ctx2)

            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");

    (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_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

                && !SSL_set_session_id_context(con,