From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Wed, 12 Feb 2025 13:40:08 +0000 (+0100)
Subject: When we try to get a group, we need session to be valid
X-Git-Tag: openssl-3.5.0-alpha1~491
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ca80d39412bf1fe2da6ef7691d1263fa8b23cde;p=thirdparty%2Fopenssl.git

When we try to get a group, we need session to be valid

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26722)
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 5e7f89847d1..8ff338a8fda 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3779,7 +3779,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             if (SSL_CONNECTION_IS_TLS13(sc) && sc->s3.did_kex)
                 id = sc->s3.group_id;
             else
-                id = sc->session->kex_group;
+                id = (sc->session != NULL) ? sc->session->kex_group : NID_undef;
             ret = tls1_group_id2nid(id, 1);
             break;
         }