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 6507d5db7103761e57a122d4d9b8a1ce27d86f1e..44ad368d0e0855b40c01bd9a1a6d5e3ee8f2f3d8 100644 (file)
--- 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))