From: Lutz Jänicke <jaenicke@openssl.org>
Date: Fri, 15 Nov 2002 10:51:40 +0000 (+0000)
Subject: The pointer to the cipher object is not yet set, when session was reloaded
X-Git-Tag: OpenSSL_0_9_7-beta4~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da91e37d37049a4d2bb09384ec937545eaf3678f;p=oweals%2Fopenssl.git

The pointer to the cipher object is not yet set, when session was reloaded
from external cache (using d2i_SSL_SESSION). Perform comparison based on
the cipher's id instead.
Submitted by: Steve Haslam <araqnid@innocent.com>
Reviewed by:
PR: 288
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 6507d5db71..44ad368d0e 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -696,7 +696,7 @@ static int ssl3_get_server_hello(SSL *s)
 		goto f_err;
 		}
 
-	if (s->hit && (s->session->cipher != c))
+	if (s->hit && (s->session->cipher_id != c->id))
 		{
 		if (!(s->options &
 			SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))