diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2002-10-29 00:33:04 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2002-10-29 00:33:04 +0000 |
| commit | e0db2eed8df76d0732839910e90882ee7266c46d (patch) | |
| tree | 760983fb2188c3200a79901942bdd1dbbba1ec4a /ssl/ssl_lib.c | |
| parent | 00a357ab203b4153eee970ffb33f0f22ef59f734 (diff) | |
| download | openssl-e0db2eed8df76d0732839910e90882ee7266c46d.zip openssl-e0db2eed8df76d0732839910e90882ee7266c46d.tar.gz openssl-e0db2eed8df76d0732839910e90882ee7266c46d.tar.bz2 | |
Correct and enhance the behaviour of "internal" session caching as it
relates to SSL_CTX flags and the use of "external" session caching. The
existing flag, "SSL_SESS_CACHE_NO_INTERNAL_LOOKUP" remains but is
supplemented with a complimentary flag, "SSL_SESS_CACHE_NO_INTERNAL_STORE".
The bitwise OR of the two flags is also defined as
"SSL_SESS_CACHE_NO_INTERNAL" and is the flag that should be used by most
applications wanting to implement session caching *entirely* by its own
provided callbacks. As the documented behaviour contradicted actual
behaviour up until recently, and since that point behaviour has itself been
inconsistent anyway, this change should not introduce any compatibility
problems. I've adjusted the relevant documentation to elaborate about how
this works.
Kudos to "Nadav Har'El" <nyh@math.technion.ac.il> for diagnosing these
anomalies and testing this patch for correctness.
PR: 311
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 1ddd338..851155e 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1803,7 +1803,7 @@ void ssl_update_cache(SSL *s,int mode) i=s->ctx->session_cache_mode; if ((i & mode) && (!s->hit) - && ((i & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP) + && ((i & SSL_SESS_CACHE_NO_INTERNAL_STORE) || SSL_CTX_add_session(s->ctx,s->session)) && (s->ctx->new_session_cb != NULL)) { |