/*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* https://www.openssl.org/source/license.html
*/
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+# include <spthread.h>
+# include <spt_extensions.h> /* timeval */
+#endif
#include <stdio.h>
#include <openssl/rand.h>
#include <openssl/engine.h>
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);
+DEFINE_STACK_OF(SSL_SESSION)
+
+__owur static ossl_inline int sess_timedout(OSSL_TIME t, SSL_SESSION *ss)
+{
+ return ossl_time_compare(t, ss->calc_timeout) > 0;
+}
+
+/*
+ * Returns -1/0/+1 as other XXXcmp-type functions
+ * Takes calculated timeout into consideration
+ */
+__owur static ossl_inline int timeoutcmp(SSL_SESSION *a, SSL_SESSION *b)
+{
+ return ossl_time_compare(a->calc_timeout, b->calc_timeout);
+}
+
+/*
+ * Calculates effective timeout
+ * Locking must be done by the caller of this function
+ */
+void ssl_session_calculate_timeout(SSL_SESSION *ss)
+{
+ ss->calc_timeout = ossl_time_add(ss->time, ss->timeout);
+}
+
/*
* SSL_get_session() and SSL_get1_session() are problematic in TLS1.3 because,
* unlike in earlier protocol versions, the session ticket may not have been
SSL_SESSION *SSL_get_session(const SSL *ssl)
/* aka SSL_get0_session; gets 0 objects, just returns a copy of the pointer */
{
- return ssl->session;
+ const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
+
+ if (sc == NULL)
+ return NULL;
+
+ return sc->session;
}
SSL_SESSION *SSL_get1_session(SSL *ssl)
/* variant of SSL_get_session: caller really gets something */
{
SSL_SESSION *sess;
+
/*
* Need to lock this all up rather than just use CRYPTO_add so that
* somebody doesn't free ssl->session between when we check it's non-null
* and when we up the reference count.
*/
- CRYPTO_THREAD_read_lock(ssl->lock);
- sess = ssl->session;
- if (sess)
+ if (!CRYPTO_THREAD_read_lock(ssl->lock))
+ return NULL;
+ sess = SSL_get_session(ssl);
+ if (sess != NULL)
SSL_SESSION_up_ref(sess);
CRYPTO_THREAD_unlock(ssl->lock);
return sess;
return NULL;
ss = OPENSSL_zalloc(sizeof(*ss));
- if (ss == NULL) {
- ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
+ if (ss == NULL)
return NULL;
- }
ss->verify_result = 1; /* avoid 0 (= X509_V_OK) just in case */
ss->references = 1;
- ss->timeout = 60 * 5 + 4; /* 5 minute timeout by default */
- ss->time = (unsigned long)time(NULL);
+ /* 5 minute timeout by default */
+ ss->timeout = ossl_seconds2time(60 * 5 + 4);
+ ss->time = ossl_time_now();
+ ssl_session_calculate_timeout(ss);
ss->lock = CRYPTO_THREAD_lock_new();
if (ss->lock == NULL) {
- ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
+ ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
OPENSSL_free(ss);
return NULL;
}
dest->references = 1;
dest->lock = CRYPTO_THREAD_lock_new();
- if (dest->lock == NULL)
+ if (dest->lock == NULL) {
+ ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
goto err;
+ }
- if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data))
+ if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data)) {
+ ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
goto err;
+ }
if (src->peer != NULL) {
- if (!X509_up_ref(src->peer))
+ if (!X509_up_ref(src->peer)) {
+ ERR_raise(ERR_LIB_SSL, ERR_R_X509_LIB);
goto err;
+ }
dest->peer = src->peer;
}
if (src->peer_chain != NULL) {
dest->peer_chain = X509_chain_up_ref(src->peer_chain);
- if (dest->peer_chain == NULL)
+ if (dest->peer_chain == NULL) {
+ ERR_raise(ERR_LIB_SSL, ERR_R_X509_LIB);
goto err;
+ }
}
#ifndef OPENSSL_NO_PSK
if (src->psk_identity_hint) {
dest->psk_identity_hint = OPENSSL_strdup(src->psk_identity_hint);
- if (dest->psk_identity_hint == NULL) {
+ if (dest->psk_identity_hint == NULL)
goto err;
- }
}
if (src->psk_identity) {
dest->psk_identity = OPENSSL_strdup(src->psk_identity);
- if (dest->psk_identity == NULL) {
+ if (dest->psk_identity == NULL)
goto err;
- }
}
#endif
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL_SESSION,
&dest->ex_data, &src->ex_data)) {
+ ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
goto err;
}
if (src->ext.hostname) {
dest->ext.hostname = OPENSSL_strdup(src->ext.hostname);
- if (dest->ext.hostname == NULL) {
+ if (dest->ext.hostname == NULL)
goto err;
- }
}
if (ticket != 0 && src->ext.tick != NULL) {
#ifndef OPENSSL_NO_SRP
if (src->srp_username) {
dest->srp_username = OPENSSL_strdup(src->srp_username);
- if (dest->srp_username == NULL) {
+ if (dest->srp_username == NULL)
goto err;
- }
}
#endif
return dest;
err:
- ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
SSL_SESSION_free(dest);
return NULL;
}
{
unsigned int retry = 0;
do
- if (RAND_bytes_ex(ssl->ctx->libctx, id, *id_len) <= 0)
+ if (RAND_bytes_ex(ssl->ctx->libctx, id, *id_len, 0) <= 0)
return 0;
while (SSL_has_matching_session_id(ssl, id, *id_len) &&
(++retry < MAX_SESS_ID_ATTEMPTS)) ;
return 0;
}
-int ssl_generate_session_id(SSL *s, SSL_SESSION *ss)
+int ssl_generate_session_id(SSL_CONNECTION *s, SSL_SESSION *ss)
{
unsigned int tmp;
GEN_SESSION_CB cb = def_generate_session_id;
+ SSL *ssl = SSL_CONNECTION_GET_SSL(s);
switch (s->version) {
case SSL3_VERSION:
}
/* Choose which callback will set the session ID */
- CRYPTO_THREAD_read_lock(s->lock);
- CRYPTO_THREAD_read_lock(s->session_ctx->lock);
+ if (!CRYPTO_THREAD_read_lock(SSL_CONNECTION_GET_SSL(s)->lock))
+ return 0;
+ if (!CRYPTO_THREAD_read_lock(s->session_ctx->lock)) {
+ CRYPTO_THREAD_unlock(ssl->lock);
+ SSLfatal(s, SSL_AD_INTERNAL_ERROR,
+ SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
+ return 0;
+ }
if (s->generate_session_id)
cb = s->generate_session_id;
else if (s->session_ctx->generate_session_id)
cb = s->session_ctx->generate_session_id;
CRYPTO_THREAD_unlock(s->session_ctx->lock);
- CRYPTO_THREAD_unlock(s->lock);
+ CRYPTO_THREAD_unlock(ssl->lock);
/* Choose a session ID */
memset(ss->session_id, 0, ss->session_id_length);
tmp = (int)ss->session_id_length;
- if (!cb(s, ss->session_id, &tmp)) {
+ if (!cb(ssl, ss->session_id, &tmp)) {
/* The callback failed */
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
SSL_R_SSL_SESSION_ID_CALLBACK_FAILED);
}
ss->session_id_length = tmp;
/* Finally, check for a conflict */
- if (SSL_has_matching_session_id(s, ss->session_id,
+ if (SSL_has_matching_session_id(ssl, ss->session_id,
(unsigned int)ss->session_id_length)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_SSL_SESSION_ID_CONFLICT);
return 0;
return 1;
}
-int ssl_get_new_session(SSL *s, int session)
+int ssl_get_new_session(SSL_CONNECTION *s, int session)
{
/* This gets used by clients and servers. */
SSL_SESSION *ss = NULL;
if ((ss = SSL_SESSION_new()) == NULL) {
- SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE);
+ SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_SSL_LIB);
return 0;
}
/* If the context has a default timeout, use it */
- if (s->session_ctx->session_timeout == 0)
- ss->timeout = SSL_get_default_timeout(s);
+ if (ossl_time_is_zero(s->session_ctx->session_timeout))
+ ss->timeout = SSL_CONNECTION_GET_SSL(s)->method->get_timeout();
else
ss->timeout = s->session_ctx->session_timeout;
+ ssl_session_calculate_timeout(ss);
SSL_SESSION_free(s->session);
s->session = NULL;
if (session) {
- if (SSL_IS_TLS13(s)) {
+ if (SSL_CONNECTION_IS_TLS13(s)) {
/*
* We generate the session id while constructing the
* NewSessionTicket in TLSv1.3.
return 1;
}
-SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
+SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
+ const unsigned char *sess_id,
size_t sess_id_len)
{
SSL_SESSION *ret = NULL;
memcpy(data.session_id, sess_id, sess_id_len);
data.session_id_length = sess_id_len;
- CRYPTO_THREAD_read_lock(s->session_ctx->lock);
+ if (!CRYPTO_THREAD_read_lock(s->session_ctx->lock))
+ return NULL;
ret = lh_SSL_SESSION_retrieve(s->session_ctx->sessions, &data);
if (ret != NULL) {
/* don't allow other threads to steal it: */
}
CRYPTO_THREAD_unlock(s->session_ctx->lock);
if (ret == NULL)
- tsan_counter(&s->session_ctx->stats.sess_miss);
+ ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_miss);
}
if (ret == NULL && s->session_ctx->get_session_cb != NULL) {
int copy = 1;
- ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, ©);
+ ret = s->session_ctx->get_session_cb(SSL_CONNECTION_GET_SSL(s),
+ sess_id, sess_id_len, ©);
if (ret != NULL) {
- tsan_counter(&s->session_ctx->stats.sess_cb_hit);
+ ssl_tsan_counter(s->session_ctx,
+ &s->session_ctx->stats.sess_cb_hit);
/*
* Increment reference count now if the session callback asks us
* - Both for new and resumed sessions, s->ext.ticket_expected is set to 1
* if the server should issue a new session ticket (to 0 otherwise).
*/
-int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello)
+int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
{
/* This is used only by servers. */
int try_session_cache = 0;
SSL_TICKET_STATUS r;
- if (SSL_IS_TLS13(s)) {
+ if (SSL_CONNECTION_IS_TLS13(s)) {
/*
* By default we will send a new ticket. This can be overridden in the
* ticket processing.
goto err;
}
- if (ret->timeout < (long)(time(NULL) - ret->time)) { /* timeout */
- tsan_counter(&s->session_ctx->stats.sess_timeout);
+ if (sess_timedout(ossl_time_now(), ret)) {
+ ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_timeout);
if (try_session_cache) {
/* session was from the cache, so remove it */
SSL_CTX_remove_session(s->session_ctx, ret);
goto err;
}
- if (!SSL_IS_TLS13(s)) {
+ if (!SSL_CONNECTION_IS_TLS13(s)) {
/* We already did this for TLS1.3 */
SSL_SESSION_free(s->session);
s->session = ret;
}
- tsan_counter(&s->session_ctx->stats.sess_hit);
+ ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_hit);
s->verify_result = s->session->verify_result;
return 1;
if (ret != NULL) {
SSL_SESSION_free(ret);
/* In TLSv1.3 s->session was already set to ret, so we NULL it out */
- if (SSL_IS_TLS13(s))
+ if (SSL_CONNECTION_IS_TLS13(s))
s->session = NULL;
if (!try_session_cache) {
* if session c is in already in cache, we take back the increment later
*/
- CRYPTO_THREAD_write_lock(ctx->lock);
+ if (!CRYPTO_THREAD_write_lock(ctx->lock)) {
+ SSL_SESSION_free(c);
+ return 0;
+ }
s = lh_SSL_SESSION_insert(ctx->sessions, c);
/*
s = c;
}
- /* Put at the head of the queue unless it is already in the cache */
- if (s == NULL)
- SSL_SESSION_list_add(ctx, c);
-
- if (s != NULL) {
- /*
- * existing cache entry -- decrement previously incremented reference
- * count because it already takes into account the cache
- */
+ /* Adjust last used time, and add back into the cache at the appropriate spot */
+ if (ctx->session_cache_mode & SSL_SESS_CACHE_UPDATE_TIME) {
+ c->time = ossl_time_now();
+ ssl_session_calculate_timeout(c);
+ }
- SSL_SESSION_free(s); /* s == c */
- ret = 0;
- } else {
+ if (s == NULL) {
/*
* new cache entry -- remove old ones if cache has become too large
+ * delete cache entry *before* add, so we don't remove the one we're adding!
*/
ret = 1;
if (SSL_CTX_sess_get_cache_size(ctx) > 0) {
- while (SSL_CTX_sess_number(ctx) > SSL_CTX_sess_get_cache_size(ctx)) {
+ while (SSL_CTX_sess_number(ctx) >= SSL_CTX_sess_get_cache_size(ctx)) {
if (!remove_session_lock(ctx, ctx->session_cache_tail, 0))
break;
else
- tsan_counter(&ctx->stats.sess_cache_full);
+ ssl_tsan_counter(ctx, &ctx->stats.sess_cache_full);
}
}
}
+
+ SSL_SESSION_list_add(ctx, c);
+
+ if (s != NULL) {
+ /*
+ * existing cache entry -- decrement previously incremented reference
+ * count because it already takes into account the cache
+ */
+
+ SSL_SESSION_free(s); /* s == c */
+ ret = 0;
+ }
CRYPTO_THREAD_unlock(ctx->lock);
return ret;
}
int ret = 0;
if ((c != NULL) && (c->session_id_length != 0)) {
- if (lck)
- CRYPTO_THREAD_write_lock(ctx->lock);
+ if (lck) {
+ if (!CRYPTO_THREAD_write_lock(ctx->lock))
+ return 0;
+ }
if ((r = lh_SSL_SESSION_retrieve(ctx->sessions, c)) != NULL) {
ret = 1;
r = lh_SSL_SESSION_delete(ctx->sessions, r);
if (ret)
SSL_SESSION_free(r);
- } else
- ret = 0;
+ }
return ret;
}
OPENSSL_cleanse(ss->master_key, sizeof(ss->master_key));
OPENSSL_cleanse(ss->session_id, sizeof(ss->session_id));
X509_free(ss->peer);
- sk_X509_pop_free(ss->peer_chain, X509_free);
+ OSSL_STACK_OF_X509_free(ss->peer_chain);
OPENSSL_free(ss->ext.hostname);
OPENSSL_free(ss->ext.tick);
#ifndef OPENSSL_NO_PSK
int SSL_set_session(SSL *s, SSL_SESSION *session)
{
- ssl_clear_bad_session(s);
+ SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
+
+ if (sc == NULL)
+ return 0;
+
+ ssl_clear_bad_session(sc);
if (s->ctx->method != s->method) {
if (!SSL_set_ssl_method(s, s->ctx->method))
return 0;
if (session != NULL) {
SSL_SESSION_up_ref(session);
- s->verify_result = session->verify_result;
+ sc->verify_result = session->verify_result;
}
- SSL_SESSION_free(s->session);
- s->session = session;
+ SSL_SESSION_free(sc->session);
+ sc->session = session;
return 1;
}
long SSL_SESSION_set_timeout(SSL_SESSION *s, long t)
{
- if (s == NULL)
+ OSSL_TIME new_timeout = ossl_seconds2time(t);
+
+ if (s == NULL || t < 0)
return 0;
- s->timeout = t;
+ if (s->owner != NULL) {
+ if (!CRYPTO_THREAD_write_lock(s->owner->lock))
+ return 0;
+ s->timeout = new_timeout;
+ ssl_session_calculate_timeout(s);
+ SSL_SESSION_list_add(s->owner, s);
+ CRYPTO_THREAD_unlock(s->owner->lock);
+ } else {
+ s->timeout = new_timeout;
+ ssl_session_calculate_timeout(s);
+ }
return 1;
}
{
if (s == NULL)
return 0;
- return s->timeout;
+ return (long)ossl_time_to_time_t(s->timeout);
}
long SSL_SESSION_get_time(const SSL_SESSION *s)
{
if (s == NULL)
return 0;
- return s->time;
+ return (long)ossl_time_to_time_t(s->time);
}
long SSL_SESSION_set_time(SSL_SESSION *s, long t)
{
+ OSSL_TIME new_time = ossl_time_from_time_t((time_t)t);
+
if (s == NULL)
return 0;
- s->time = t;
+ if (s->owner != NULL) {
+ if (!CRYPTO_THREAD_write_lock(s->owner->lock))
+ return 0;
+ s->time = new_time;
+ ssl_session_calculate_timeout(s);
+ SSL_SESSION_list_add(s->owner, s);
+ CRYPTO_THREAD_unlock(s->owner->lock);
+ } else {
+ s->time = new_time;
+ ssl_session_calculate_timeout(s);
+ }
return t;
}
long SSL_CTX_set_timeout(SSL_CTX *s, long t)
{
long l;
+
if (s == NULL)
return 0;
- l = s->session_timeout;
- s->session_timeout = t;
+ l = (long)ossl_time2seconds(s->session_timeout);
+ s->session_timeout = ossl_seconds2time(t);
return l;
}
{
if (s == NULL)
return 0;
- return s->session_timeout;
+ return (long)ossl_time2seconds(s->session_timeout);
}
int SSL_set_session_secret_cb(SSL *s,
tls_session_secret_cb_fn tls_session_secret_cb,
void *arg)
{
- if (s == NULL)
+ SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
+
+ if (sc == NULL)
return 0;
- s->ext.session_secret_cb = tls_session_secret_cb;
- s->ext.session_secret_cb_arg = arg;
+
+ sc->ext.session_secret_cb = tls_session_secret_cb;
+ sc->ext.session_secret_cb_arg = arg;
return 1;
}
int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
void *arg)
{
- if (s == NULL)
+ SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
+
+ if (sc == NULL)
return 0;
- s->ext.session_ticket_cb = cb;
- s->ext.session_ticket_cb_arg = arg;
+
+ sc->ext.session_ticket_cb = cb;
+ sc->ext.session_ticket_cb_arg = arg;
return 1;
}
int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
{
- if (s->version >= TLS1_VERSION) {
- OPENSSL_free(s->ext.session_ticket);
- s->ext.session_ticket = NULL;
- s->ext.session_ticket =
+ SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
+
+ if (sc == NULL)
+ return 0;
+
+ if (sc->version >= TLS1_VERSION) {
+ OPENSSL_free(sc->ext.session_ticket);
+ sc->ext.session_ticket = NULL;
+ sc->ext.session_ticket =
OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
- if (s->ext.session_ticket == NULL) {
- ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
+ if (sc->ext.session_ticket == NULL)
return 0;
- }
if (ext_data != NULL) {
- s->ext.session_ticket->length = ext_len;
- s->ext.session_ticket->data = s->ext.session_ticket + 1;
- memcpy(s->ext.session_ticket->data, ext_data, ext_len);
+ sc->ext.session_ticket->length = ext_len;
+ sc->ext.session_ticket->data = sc->ext.session_ticket + 1;
+ memcpy(sc->ext.session_ticket->data, ext_data, ext_len);
} else {
- s->ext.session_ticket->length = 0;
- s->ext.session_ticket->data = NULL;
+ sc->ext.session_ticket->length = 0;
+ sc->ext.session_ticket->data = NULL;
}
return 1;
return 0;
}
-typedef struct timeout_param_st {
- SSL_CTX *ctx;
- long time;
- LHASH_OF(SSL_SESSION) *cache;
-} TIMEOUT_PARAM;
-
-static void timeout_cb(SSL_SESSION *s, TIMEOUT_PARAM *p)
-{
- if ((p->time == 0) || (p->time > (s->time + s->timeout))) { /* timeout */
- /*
- * The reason we don't call SSL_CTX_remove_session() is to save on
- * locking overhead
- */
- (void)lh_SSL_SESSION_delete(p->cache, s);
- SSL_SESSION_list_remove(p->ctx, s);
- s->not_resumable = 1;
- if (p->ctx->remove_session_cb != NULL)
- p->ctx->remove_session_cb(p->ctx, s);
- SSL_SESSION_free(s);
- }
-}
-
-IMPLEMENT_LHASH_DOALL_ARG(SSL_SESSION, TIMEOUT_PARAM);
-
void SSL_CTX_flush_sessions(SSL_CTX *s, long t)
{
+ STACK_OF(SSL_SESSION) *sk;
+ SSL_SESSION *current;
unsigned long i;
- TIMEOUT_PARAM tp;
+ const OSSL_TIME timeout = ossl_time_from_time_t(t);
- tp.ctx = s;
- tp.cache = s->sessions;
- if (tp.cache == NULL)
+ if (!CRYPTO_THREAD_write_lock(s->lock))
return;
- tp.time = t;
- CRYPTO_THREAD_write_lock(s->lock);
+
+ sk = sk_SSL_SESSION_new_null();
i = lh_SSL_SESSION_get_down_load(s->sessions);
lh_SSL_SESSION_set_down_load(s->sessions, 0);
- lh_SSL_SESSION_doall_TIMEOUT_PARAM(tp.cache, timeout_cb, &tp);
+
+ /*
+ * Iterate over the list from the back (oldest), and stop
+ * when a session can no longer be removed.
+ * Add the session to a temporary list to be freed outside
+ * the SSL_CTX lock.
+ * But still do the remove_session_cb() within the lock.
+ */
+ while (s->session_cache_tail != NULL) {
+ current = s->session_cache_tail;
+ if (t == 0 || sess_timedout(timeout, current)) {
+ lh_SSL_SESSION_delete(s->sessions, current);
+ SSL_SESSION_list_remove(s, current);
+ current->not_resumable = 1;
+ if (s->remove_session_cb != NULL)
+ s->remove_session_cb(s, current);
+ /*
+ * Throw the session on a stack, it's entirely plausible
+ * that while freeing outside the critical section, the
+ * session could be re-added, so avoid using the next/prev
+ * pointers. If the stack failed to create, or the session
+ * couldn't be put on the stack, just free it here
+ */
+ if (sk == NULL || !sk_SSL_SESSION_push(sk, current))
+ SSL_SESSION_free(current);
+ } else {
+ break;
+ }
+ }
+
lh_SSL_SESSION_set_down_load(s->sessions, i);
CRYPTO_THREAD_unlock(s->lock);
+
+ sk_SSL_SESSION_pop_free(sk, SSL_SESSION_free);
}
-int ssl_clear_bad_session(SSL *s)
+int ssl_clear_bad_session(SSL_CONNECTION *s)
{
if ((s->session != NULL) &&
!(s->shutdown & SSL_SENT_SHUTDOWN) &&
- !(SSL_in_init(s) || SSL_in_before(s))) {
+ !(SSL_in_init(SSL_CONNECTION_GET_SSL(s))
+ || SSL_in_before(SSL_CONNECTION_GET_SSL(s)))) {
SSL_CTX_remove_session(s->session_ctx, s->session);
return 1;
} else
}
}
s->prev = s->next = NULL;
+ s->owner = NULL;
}
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s)
{
+ SSL_SESSION *next;
+
if ((s->next != NULL) && (s->prev != NULL))
SSL_SESSION_list_remove(ctx, s);
s->prev = (SSL_SESSION *)&(ctx->session_cache_head);
s->next = (SSL_SESSION *)&(ctx->session_cache_tail);
} else {
- s->next = ctx->session_cache_head;
- s->next->prev = s;
- s->prev = (SSL_SESSION *)&(ctx->session_cache_head);
- ctx->session_cache_head = s;
+ if (timeoutcmp(s, ctx->session_cache_head) >= 0) {
+ /*
+ * if we timeout after (or the same time as) the first
+ * session, put us first - usual case
+ */
+ s->next = ctx->session_cache_head;
+ s->next->prev = s;
+ s->prev = (SSL_SESSION *)&(ctx->session_cache_head);
+ ctx->session_cache_head = s;
+ } else if (timeoutcmp(s, ctx->session_cache_tail) < 0) {
+ /* if we timeout before the last session, put us last */
+ s->prev = ctx->session_cache_tail;
+ s->prev->next = s;
+ s->next = (SSL_SESSION *)&(ctx->session_cache_tail);
+ ctx->session_cache_tail = s;
+ } else {
+ /*
+ * we timeout somewhere in-between - if there is only
+ * one session in the cache it will be caught above
+ */
+ next = ctx->session_cache_head->next;
+ while (next != (SSL_SESSION*)&(ctx->session_cache_tail)) {
+ if (timeoutcmp(s, next) >= 0) {
+ s->next = next;
+ s->prev = next->prev;
+ next->prev->next = s;
+ next->prev = s;
+ break;
+ }
+ next = next->next;
+ }
+ }
}
+ s->owner = ctx;
}
void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
}
void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
- SSL_SESSION *(*cb) (struct ssl_st *ssl,
+ SSL_SESSION *(*cb) (SSL *ssl,
const unsigned char *data,
int len, int *copy))
{
projects / openssl.git / blobdiff