From: Matt Caswell <matt@openssl.org>
Date: Fri, 6 Apr 2018 13:33:07 +0000 (+0100)
Subject: Ignore the status_request extension in a resumption handshake
X-Git-Tag: OpenSSL_1_0_2p~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1084fc8f0086cece8ae1a1e9f484d30fdff25192;p=oweals%2Fopenssl.git

Ignore the status_request extension in a resumption handshake

We cannot provide a certificate status on a resumption so we should
ignore this extension in that case.

Fixes #1662

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5898)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 75c2f4154d..179802ca59 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2408,8 +2408,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
                 goto err;
             if (!tls1_save_sigalgs(s, data, dsize))
                 goto err;
-        } else if (type == TLSEXT_TYPE_status_request) {
-
+        } else if (type == TLSEXT_TYPE_status_request && !s->hit) {
             if (size < 5)
                 goto err;