From: Todd Short <todd.short@me.com>
Date: Fri, 23 Jul 2021 13:25:09 +0000 (-0400)
Subject: Add missing session timeout calc
X-Git-Tag: openssl-3.0.0-beta2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a65c8d8f737fe4e67d0b37e2b20dc1adccd93112;p=thirdparty%2Fopenssl.git

Add missing session timeout calc

Fixes #16142

Add missing session timeout calculation in `ssl_get_new_session()`

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16145)
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index b5269842892..0e756c37c1a 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -437,6 +437,7 @@ int ssl_get_new_session(SSL *s, int session)
         ss->timeout = SSL_get_default_timeout(s);
     else
         ss->timeout = s->session_ctx->session_timeout;
+    ssl_session_calculate_timeout(ss);
 
     SSL_SESSION_free(s->session);
     s->session = NULL;