projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96d6a4e
)
Add missing session timeout calc
author
Todd Short
<todd.short@me.com>
Fri, 23 Jul 2021 13:25:09 +0000
(09:25 -0400)
committer
Pauli
<pauli@openssl.org>
Wed, 28 Jul 2021 00:37:21 +0000
(10:37 +1000)
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)
ssl/ssl_sess.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_sess.c
b/ssl/ssl_sess.c
index b52698428926b446bf70eac311f21ad66b88a866..0e756c37c1ace14c8e25ce6d503f49a06a1f8ac0 100644
(file)
--- 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;