Commit e2bb9b9b authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Always use session_ctx when removing a session 



Sessions are stored on the session_ctx, which doesn't change after
SSL_set_SSL_CTX().

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 77a795e4

ssl/record/rec_layer_d1.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
            BIO_snprintf(tmp, sizeof tmp, "%d", alert_descr);

            ERR_add_error_data(2, "SSL alert number ", tmp);

            s->shutdown |= SSL_RECEIVED_SHUTDOWN;

            SSL_CTX_remove_session(s->ctx, s->session);

            SSL_CTX_remove_session(s->session_ctx, s->session);

            return (0);

        } else {

            al = SSL_AD_ILLEGAL_PARAMETER;

ssl/record/rec_layer_s3.c

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, 
            BIO_snprintf(tmp, sizeof tmp, "%d", alert_descr);

            ERR_add_error_data(2, "SSL alert number ", tmp);

            s->shutdown |= SSL_RECEIVED_SHUTDOWN;

            SSL_CTX_remove_session(s->ctx, s->session);

            SSL_CTX_remove_session(s->session_ctx, s->session);

            return (0);

        } else {

            al = SSL_AD_ILLEGAL_PARAMETER;

ssl/s3_msg.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int ssl3_send_alert(SSL *s, int level, int desc) 
        return -1;

    /* If a fatal one, remove from cache */

    if ((level == SSL3_AL_FATAL) && (s->session != NULL))

        SSL_CTX_remove_session(s->ctx, s->session);

        SSL_CTX_remove_session(s->session_ctx, s->session);



    s->s3->alert_dispatch = 1;

    s->s3->send_alert[0] = level;

ssl/ssl_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -746,9 +746,9 @@ int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id, 
    r.session_id_length = id_len;

    memcpy(r.session_id, id, id_len);



    CRYPTO_THREAD_read_lock(ssl->ctx->lock);

    p = lh_SSL_SESSION_retrieve(ssl->ctx->sessions, &r);

    CRYPTO_THREAD_unlock(ssl->ctx->lock);

    CRYPTO_THREAD_read_lock(ssl->session_ctx->lock);

    p = lh_SSL_SESSION_retrieve(ssl->session_ctx->sessions, &r);

    CRYPTO_THREAD_unlock(ssl->session_ctx->lock);

    return (p != NULL);

}

ssl/ssl_sess.c

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ int ssl_clear_bad_session(SSL *s) 
    if ((s->session != NULL) &&

        !(s->shutdown & SSL_SENT_SHUTDOWN) &&

        !(SSL_in_init(s) || SSL_in_before(s))) {

        SSL_CTX_remove_session(s->ctx, s->session);

        SSL_CTX_remove_session(s->session_ctx, s->session);

        return (1);

    } else

        return (0);