aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2002-11-15 10:53:33 +0000
committerLutz Jänicke <jaenicke@openssl.org>2002-11-15 10:53:33 +0000
commitc566205319beeaa196e247400c7eb0c16388372b (patch)
tree869ce3b5f569a62ed42be43df254680fbed55c9d /ssl
parenteaf6c61c9f378bec0132d4cae556eee563f545b5 (diff)
downloadopenssl-c566205319beeaa196e247400c7eb0c16388372b.tar.gz
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
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_clnt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 5e5a409ed2..bc7523cdf1 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -722,7 +722,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))