diff options
| author | Matt Caswell <matt@openssl.org> | 2024-03-15 17:58:42 +0000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-04-08 12:07:42 +0200 |
| commit | 1222c4e62d063573a7953bd7d70dc2cc3854d952 (patch) | |
| tree | 1a520bde33bc05a50070dad71b5e68e743524a51 | |
| parent | 16e2b1080aae827878315dc7124d471d24c80783 (diff) | |
Hardening around not_resumable sessions
Make sure we can't inadvertently use a not_resumable session
Related to CVE-2024-2511
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24042)
(cherry picked from commit 21df7f04f6c4a560b4de56d10e1e58958c7e566d)
| -rw-r--r-- | ssl/ssl_sess.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 60ceacde4e..eaa9595f8c 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -519,6 +519,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s, sess_id, sess_id_len, ©); if (ret != NULL) { + if (ret->not_resumable) { + /* If its not resumable then ignore this session */ + if (!copy) + SSL_SESSION_free(ret); + return NULL; + } ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_cb_hit); |