From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 14 Jun 2014 21:24:08 +0000 (+0100)
Subject: Accept CCS after sending finished.
X-Git-Tag: OpenSSL_0_9_8zb~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70d923fb0359ed68e59b8c59d1687ebff6f8d952;p=oweals%2Fopenssl.git

Accept CCS after sending finished.

Allow CCS after finished has been sent by client: at this point
keys have been correctly set up so it is OK to accept CCS from
server. Without this renegotiation can sometimes fail.

PR#3400
(cherry picked from commit 99cd6a91fcb0931feaebbb4832681d40a66fad41)
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 06fb2754f0..4b41a2be9d 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -442,6 +442,7 @@ int ssl3_connect(SSL *s)
 				s->method->ssl3_enc->client_finished_label,
 				s->method->ssl3_enc->client_finished_label_len);
 			if (ret <= 0) goto end;
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			s->state=SSL3_ST_CW_FLUSH;
 
 			/* clear flags */