summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-06-07 15:21:13 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-07 15:27:21 +0100
commite966578d2f701b74c98205ef7149d70e90662166 (patch)
tree51698e0aee3ca71d2d87e5f6d685b3e46ba24b12 /ssl
parent7bab3c16ff966d09bd9d217052fe082a1e262456 (diff)
Make tls_session_secret_cb work with CVE-2014-0224 fix.
If application uses tls_session_secret_cb for session resumption set the CCS_OK flag. (cherry picked from commit 953c592572e8811b7956cc09fbd8e98037068b58)
Diffstat (limited to 'ssl')
-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 83d6ede3f7..2b1d2b8c57 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -815,6 +815,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 */