projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce00c64
)
Accept CCS after sending finished.
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 14 Jun 2014 21:24:08 +0000
(22:24 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 14 Jun 2014 21:31:28 +0000
(22:31 +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
ssl/s3_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_clnt.c
b/ssl/s3_clnt.c
index cd43873e56ee435246a689a5b88af82f5bf07f43..d0094008918116806a2237b725e5f4e3ea232b50 100644
(file)
--- a/
ssl/s3_clnt.c
+++ b/
ssl/s3_clnt.c
@@
-550,6
+550,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 */