Fix bug introduced by the attempt to fix client side external session
caching (#288): now internal caching failed (#351): Make sure, that cipher_id is set before comparing. Submitted by: Reviewed by: PR: 288 (and 351)
This commit is contained in:
@@ -722,6 +722,11 @@ static int ssl3_get_server_hello(SSL *s)
|
||||
goto f_err;
|
||||
}
|
||||
|
||||
/* Depending on the session caching (internal/external), the cipher
|
||||
and/or cipher_id values may not be set. Make sure that
|
||||
cipher_id is set and use it for comparison. */
|
||||
if (s->session->cipher)
|
||||
s->session->cipher_id = s->session->cipher->id;
|
||||
if (s->hit && (s->session->cipher_id != c->id))
|
||||
{
|
||||
if (!(s->options &
|
||||
|
Reference in New Issue
Block a user