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:
c43a554
)
Make tls_session_secret_cb work with CVE-2014-0224 fix.
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 7 Jun 2014 14:21:13 +0000
(15:21 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 7 Jun 2014 14:27:23 +0000
(15:27 +0100)
If application uses tls_session_secret_cb for session resumption
set the CCS_OK flag.
ssl/s3_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_clnt.c
b/ssl/s3_clnt.c
index 34efff8c73904b977d2d9b3090dafa51f2f99d28..cd43873e56ee435246a689a5b88af82f5bf07f43 100644
(file)
--- a/
ssl/s3_clnt.c
+++ b/
ssl/s3_clnt.c
@@
-1037,6
+1037,7
@@
int ssl3_get_server_hello(SSL *s)
{
s->session->cipher = pref_cipher ?
pref_cipher : ssl_get_cipher_by_char(s, p+j);
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
}
}
#endif /* OPENSSL_NO_TLSEXT */