From: Matt Caswell <matt@openssl.org>
Date: Mon, 30 Nov 2015 13:29:41 +0000 (+0000)
Subject: Ensure we don't call the OCSP callback if resuming a session
X-Git-Tag: OpenSSL_1_1_0-pre2~154
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80e339fd09ca32680e0c0cbcfa40d73212ea276d;p=oweals%2Fopenssl.git

Ensure we don't call the OCSP callback if resuming a session

It makes no sense to call the OCSP status callback if we are resuming a
session because no certificates will be sent.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index e7d9f64bf9..df62a136f4 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2855,7 +2855,7 @@ int ssl_check_serverhello_tlsext(SSL *s)
      * callback
      */
     if ((s->tlsext_status_type != -1) && !(s->tlsext_status_expected)
-        && s->ctx && s->ctx->tlsext_status_cb) {
+        && !(s->hit) && s->ctx && s->ctx->tlsext_status_cb) {
         int r;
         /*
          * Call callback with resp == NULL and resplen == -1 so callback