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 5927a2842c65b6c0831ba26b3d3b62542eee1c96..22a0b097ac7cbe6824ffd8037efa337ab91351a2 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -695,7 +695,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))