| commit | fb8d9ddb9dc19d84dffa84932f75e607c8a3ffe6 | [log] [tgz] |
|---|---|---|
| author | Dr. Stephen Henson <steve@openssl.org> | Sat Jun 07 15:21:13 2014 +0100 |
| committer | Dr. Stephen Henson <steve@openssl.org> | Sat Jun 07 15:27:23 2014 +0100 |
| tree | e6817c748a39d8ec48d6bfda168cda107121efff | |
| parent | c43a55407dccc6902058184d7dd0bd111fe6a61e [diff] [blame] |
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.
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 34efff8..cd43873 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c
@@ -1037,6 +1037,7 @@ { 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 */