projects
/
platform
/
upstream
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd4b670
)
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
Janusz Kozerski
<j.kozerski@samsung.com>
Mon, 20 Oct 2014 13:25:26 +0000
(15:25 +0200)
If application uses tls_session_secret_cb for session resumption
set the CCS_OK flag.
(cherry picked from commit
953c592572e8811b7956cc09fbd8e98037068b58
)
ssl/s3_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_clnt.c
b/ssl/s3_clnt.c
index
0457af8
..
167bfc6
100644
(file)
--- a/
ssl/s3_clnt.c
+++ b/
ssl/s3_clnt.c
@@
-901,6
+901,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 */