summaryrefslogtreecommitdiffstats
path: root/ssl/s3_clnt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-06-14 22:24:08 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-14 22:31:28 +0100
commit90d94ce39ecc2fad7fb2b8eb6bde0c669a65ee81 (patch)
tree70346e9698708df3c0e3290c7d44205dc293399c /ssl/s3_clnt.c
parent79b960c0462be9deedf94ac7c3fb745ea491b074 (diff)
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)
Diffstat (limited to 'ssl/s3_clnt.c')
-rw-r--r--ssl/s3_clnt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9cae0d15e6..29f24f142b 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -543,6 +543,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 */