diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-18 16:27:48 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-06-02 09:30:12 +0100 |
| commit | 98ece4eebfb6cd45cc8d550c6ac0022965071afc (patch) | |
| tree | 8bc98118fe0539dfdf13bfcfeb36468cdba00ed7 /ssl/ssl_locl.h | |
| parent | 8c2b1d872b25f3ec78e04f5cd2de8f21e853c4a6 (diff) | |
Fix race condition in NewSessionTicket
If a NewSessionTicket is received by a multi-threaded client when
attempting to reuse a previous ticket then a race condition can occur
potentially leading to a double free of the ticket data.
CVE-2015-1791
This also fixes RT#3808 where a session ID is changed for a session already
in the client session cache. Since the session ID is the key to the cache
this breaks the cache access.
Parts of this patch were inspired by this Akamai change:
https://github.com/akamai/openssl/commit/c0bf69a791239ceec64509f9f19fcafb2461b0d3
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 9d1f80ab8f..3252631e1c 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1860,6 +1860,7 @@ __owur int ssl_set_peer_cert_type(SESS_CERT *c, int type); __owur int ssl_get_new_session(SSL *s, int session); __owur int ssl_get_prev_session(SSL *s, unsigned char *session, int len, const unsigned char *limit); +__owur SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket); __owur int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b); DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); __owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap, |