From: Robert Schulze <robert@clickhouse.com>
Date: Wed, 19 Jun 2024 08:40:16 +0000 (+0000)
Subject: Incorporate more review feedback
X-Git-Tag: openssl-3.4.0-alpha1~465
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af82623d32962b3eff5b0f0b0dedec5eb730b231;p=thirdparty%2Fopenssl.git

Incorporate more review feedback

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24673)
---

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 3a96c6a1361..0d979ae7237 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -530,7 +530,6 @@ struct ssl_session_st {
      * certificate is not ok, we must remember the error for session reuse:
      */
     long verify_result;         /* only for servers */
-    CRYPTO_REF_COUNT references;
     OSSL_TIME timeout;
     OSSL_TIME time;
     OSSL_TIME calc_timeout;
@@ -572,9 +571,10 @@ struct ssl_session_st {
 
     /*
      * These are used to make removal of session-ids more efficient and to
-     * implement a maximum cache size.
+     * implement a maximum cache size. Access requires protection of ctx->lock.
      */
     struct ssl_session_st *prev, *next;
+    CRYPTO_REF_COUNT references;
 };
 
 /* Extended master secret support */