summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-06-07 16:21:13 +0200
committerDr. Stephen Henson <steve@openssl.org>2014-06-07 16:27:23 +0200
commitfb8d9ddb9dc19d84dffa84932f75e607c8a3ffe6 (patch)
treee6817c748a39d8ec48d6bfda168cda107121efff /ssl
parentAdd official extension value. (diff)
downloadopenssl-fb8d9ddb9dc19d84dffa84932f75e607c8a3ffe6.tar.xz
openssl-fb8d9ddb9dc19d84dffa84932f75e607c8a3ffe6.zip
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.
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 34efff8c73..cd43873e56 100644
--- 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 */