wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only inherit the session ID context in SSL_set_SSL_CTX if the existing

Browse source 
context was also inherited (matches that of the existing SSL_CTX).

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit ac8e9cbe14)
This commit is contained in:
Emilia Kasper 2015-01-06 15:41:04 +01:00
parent c7c2a56a1b
commit ed736ddd74
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ssl/ssl_lib.c
View file

@ -3194,24 +3194,31 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
} }
ssl_cert_free(ocert); ssl_cert_free(ocert);
} }
CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX);
if (ssl->ctx != NULL)
SSL_CTX_free(ssl->ctx); /* decrement reference count */
ssl->ctx = ctx;
/*
* Inherit the session ID context as it is typically set from the
* parent SSL_CTX, and can vary with the CTX.
* Note that per-SSL SSL_set_session_id_context() will not persist
* if called before SSL_set_SSL_CTX.
*/
ssl->sid_ctx_length = ctx->sid_ctx_length;
/* /*
* Program invariant: |sid_ctx| has fixed size (SSL_MAX_SID_CTX_LENGTH), * Program invariant: |sid_ctx| has fixed size (SSL_MAX_SID_CTX_LENGTH),
* so setter APIs must prevent invalid lengths from entering the system. * so setter APIs must prevent invalid lengths from entering the system.
*/ */
OPENSSL_assert(ssl->sid_ctx_length <= sizeof ssl->sid_ctx); OPENSSL_assert(ssl->sid_ctx_length <= sizeof(ssl->sid_ctx));
memcpy(&ssl->sid_ctx, &ctx->sid_ctx, sizeof(ssl->sid_ctx));
/*
* If the session ID context matches that of the parent SSL_CTX,
* inherit it from the new SSL_CTX as well. If however the context does
* not match (i.e., it was set per-ssl with SSL_set_session_id_context),
* leave it unchanged.
*/
if ((ssl->ctx != NULL) &&
(ssl->sid_ctx_length == ssl->ctx->sid_ctx_length) &&
(memcmp(ssl->sid_ctx, ssl->ctx->sid_ctx, ssl->sid_ctx_length) == 0))
{
ssl->sid_ctx_length = ctx->sid_ctx_length;
memcpy(&ssl->sid_ctx, &ctx->sid_ctx, sizeof(ssl->sid_ctx));
}
CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX);
if (ssl->ctx != NULL)
SSL_CTX_free(ssl->ctx); /* decrement reference count */
ssl->ctx = ctx;
return(ssl->ctx); return(ssl->ctx);
} }