Accept CCS after sending finished.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 14 Jun 2014 21:24:08 +0000 (22:24 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 14 Jun 2014 21:26:31 +0000 (22:26 +0100)
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)

ssl/s3_clnt.c

index 2b1d2b8c5720f35fb43b8454ae660edc2ece42bd..4e5a95353be6f02e0ac23a0199dfe09fb48538e5 100644 (file)
@@ -467,6 +467,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 */