[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  be0c03618a53fc539761eb5f0e300d68554f85c9 (commit)
      from  e46bcca25e85a361d3ce8431ec5ccc2382ee5569 (commit)


- Log -----------------------------------------------------------------
commit be0c03618a53fc539761eb5f0e300d68554f85c9
Author: Adam Eijdenberg <eijdenberg at google.com>
Date:   Wed Jul 29 21:34:35 2015 -0400

    RT3963: Allow OCSP stapling with -rev and -www
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_server.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 3143078..a1fcb6e 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -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,