public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Incorporate review feedback

Browse source 
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)

(cherry picked from commit 8d934a7592)
This commit is contained in:
Robert Schulze 2024-06-18 20:31:14 +00:00 • committed by Tomas Mraz
parent e57d1a7794
commit 35224ef906
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ssl/ssl_local.h
View file

@ -542,11 +542,6 @@ struct ssl_session_st {
* load the 'cipher' structure */
unsigned int kex_group; /* TLS group from key exchange */
CRYPTO_EX_DATA ex_data; /* application specific data */
/*
* These are used to make removal of session-ids more efficient and to
* implement a maximum cache size.
*/
struct ssl_session_st *prev, *next;
struct {
char *hostname;
@ -576,6 +571,12 @@ struct ssl_session_st {
size_t ticket_appdata_len;
uint32_t flags;
SSL_CTX *owner;
/*
* These are used to make removal of session-ids more efficient and to
* implement a maximum cache size.
*/
struct ssl_session_st *prev, *next;
};
/* Extended master secret support */

7
ssl/ssl_sess.c
View file

@ -141,13 +141,10 @@ static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
return NULL;
/*
* Copy until prev ptr, because it's a part of sessons cache which can be modified
* concurrently. Other fields filled in the code bellow.
* src is logically read-only but the prev/next pointers are not, they are
* part of the session cache and can be modified concurrently.
*/
memcpy(dest, src, offsetof(SSL_SESSION, prev));
dest->ext = src->ext;
dest->ticket_appdata_len = src->ticket_appdata_len;
dest->flags = src->flags;
/*
* Set the various pointers to NULL so that we can call SSL_SESSION_free in