| commit | 6acf476eb6fd1fb0ff19f17d26c54eab5a7aedff | [log] [tgz] |
|---|---|---|
| author | Adam Langley <agl@chromium.org> | Fri Jun 20 12:00:00 2014 -0700 |
| committer | Adam Langley <agl@chromium.org> | Fri Jun 20 13:17:41 2014 -0700 |
| tree | cdb1e79079c606ebdebd8cd0a736b9cc3a4a71c2 | |
| parent | bed2214b3ee623f0b817fddb1042f9b0d8735243 [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. (Imported from upstream's a21f350a76b34b66dcaf9c1676baec945f32e980)
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index de7b9a4..96b7647 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c
@@ -1036,6 +1036,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 */