[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  a65c8d8f737fe4e67d0b37e2b20dc1adccd93112 (commit)
      from  96d6a4e4464c3dec9cdf2c6fb59d737c8cb1be49 (commit)


- Log -----------------------------------------------------------------
commit a65c8d8f737fe4e67d0b37e2b20dc1adccd93112
Author: Todd Short <todd.short at me.com>
Date:   Fri Jul 23 09:25:09 2021 -0400

    Add missing session timeout calc
    
    Fixes #16142
    
    Add missing session timeout calculation in `ssl_get_new_session()`
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16145)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_sess.c | 1 +
 1 file changed, 1 insertion(+)

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;