diff options
| author | Matt Caswell <matt@openssl.org> | 2018-06-07 09:11:05 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-07-02 15:06:12 +0100 |
| commit | 5d263fb78b51f96753056f21abc4d992d0219df2 (patch) | |
| tree | 6027b7132a4d5db2050ebd820bb2e163a4247641 /ssl/ssl_lib.c | |
| parent | b6ff436fcb597663ffcfe6d724d207cf120e7250 (diff) | |
| download | openssl-new-5d263fb78b51f96753056f21abc4d992d0219df2.tar.gz | |
Make the anti-replay feature optional
Fixes #6389
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6469)
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 6ced147ab8..e28e2b5eb1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3381,7 +3381,8 @@ void ssl_update_cache(SSL *s, int mode) if ((i & SSL_SESS_CACHE_NO_INTERNAL_STORE) == 0 && (!SSL_IS_TLS13(s) || !s->server - || s->max_early_data > 0 + || (s->max_early_data > 0 + && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0) || s->session_ctx->remove_session_cb != NULL || (s->options & SSL_OP_NO_TICKET) != 0)) SSL_CTX_add_session(s->session_ctx, s->session); |