diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-07 15:21:13 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-07 15:27:23 +0100 |
| commit | a21f350a76b34b66dcaf9c1676baec945f32e980 (patch) | |
| tree | d3e0c14d12171bec312d4da3ad5bb1b226f38a87 /ssl | |
| parent | 74360af359de045fb3736585dba8e761caf5f702 (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 216b9c92eb..9cae0d15e6 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1031,6 +1031,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 */ |