From: Matt Caswell <matt@openssl.org>
Date: Tue, 22 Nov 2016 16:39:27 +0000 (+0000)
Subject: Stop client from sending Certificate message when not requested
X-Git-Tag: OpenSSL_1_1_1-pre1~2640
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=10305baf26f1a43348e855266ed1f21840ec3d7d

Stop client from sending Certificate message when not requested

In a non client-auth renegotiation where the original handshake *was*
client auth, then the client will send a Certificate message anyway
resulting in a connection failure.

Fixes #1920

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1982)
---

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index a1da2a4418..f39a529463 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -355,6 +355,7 @@ static int state_machine(SSL *s, int server)
             s->hit = 0;
 
             s->s3->tmp.cert_request = 0;
+            s->s3->tmp.cert_req = 0;
 
             if (SSL_IS_DTLS(s)) {
                 st->use_timer = 1;