summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorTodd Short <todd.short@me.com>2021-07-23 09:25:09 -0400
committerPauli <pauli@openssl.org>2021-07-28 10:37:21 +1000
commita65c8d8f737fe4e67d0b37e2b20dc1adccd93112 (patch)
tree857b1aaa5451d6dd8b487246ff957be733487a44 /ssl
parent96d6a4e4464c3dec9cdf2c6fb59d737c8cb1be49 (diff)
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)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_sess.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index b526984289..0e756c37c1 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;