diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2018-01-26 11:16:21 -0600 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2018-03-20 19:36:00 -0500 |
| commit | 8e4057768586961942851d89287f43969352127a (patch) | |
| tree | 5b550b9ec91d157890e2feae6ce411b604a98f6a | |
| parent | b9b5e7144af84dd9b66d31ed6d009b40c5bcd514 (diff) | |
Do not cache sessions with zero sid_ctx_length when SSL_VERIFY_PEER
The sid_ctx is something of a "certificate request context" or a
"session ID context" -- something from the application that gives
extra indication of what sort of thing this session is/was for/from.
Without a sid_ctx, we only know that there is a session that we
issued, but it could have come from a number of things, especially
with an external (shared) session cache. Accordingly, when resuming,
we will hard-error the handshake when presented with a session with
zero-length sid_ctx and SSL_VERIFY_PEER is set -- we simply have no
information about the peer to verify, so the verification must fail.
In order to prevent these future handshake failures, proactively
decline to add the problematic sessions to the session cache.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5175)
(cherry picked from commit d316cdcf6d8d6934663278145fe0a8191e14a8c5)
| -rw-r--r-- | ssl/ssl_lib.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index d833e33e5e..bb329ad6a7 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3032,6 +3032,18 @@ void ssl_update_cache(SSL *s, int mode) if (s->session->session_id_length == 0) return; + /* + * If sid_ctx_length is 0 there is no specific application context + * associated with this session, so when we try to resume it and + * SSL_VERIFY_PEER is requested, we have no indication that this is + * actually a session for the proper application context, and the + * *handshake* will fail, not just the resumption attempt. + * Do not cache these sessions that are not resumable. + */ + if (s->session->sid_ctx_length == 0 + && (s->verify_mode & SSL_VERIFY_PEER) != 0) + return; + i = s->session_ctx->session_cache_mode; if ((i & mode) && (!s->hit) && ((i & SSL_SESS_CACHE_NO_INTERNAL_STORE) |