From: Dr. Stephen Henson Date: Sat, 14 Jun 2014 21:24:08 +0000 (+0100) Subject: Accept CCS after sending finished. X-Git-Tag: OpenSSL_1_0_1i~89 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9beb75d3c4ce9a93ba07951e8595c09f07496ba8;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 167bfc61c2..2afb892bff 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -510,6 +510,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 */