d411de33f5
Signed-off-by: ShenYage <shenyage1@huawei.com> (cherry picked from commit 591443e21eac71b083d7910220c4102648987009)
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From c44d5f799061ed8d7174c58e0cef0e43bda185be Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Fri, 15 Mar 2024 17:58:42 +0000
|
|
Subject: [PATCH 4/5] 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)
|
|
|
|
reference: https://github.com/openssl/openssl/pull/24042
|
|
Signed-off-by: shenyage <shenyage1@huawei.com>
|
|
---
|
|
CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_sess.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_sess.c b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_sess.c
|
|
index 8f2f37b..46f4f75 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_sess.c
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_sess.c
|
|
@@ -528,6 +528,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
|
|
ret = s->session_ctx->get_session_cb(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);
|
|
|
|
--
|
|
2.33.0
|
|
|