From 3e24d439313e04a1f2543e0a06c9d91a87264a7c Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 28 Oct 2009 19:50:59 +0000
Subject: oops!

---
 ssl/s3_clnt.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9322f629ce..a62ffd5eb3 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -618,15 +618,9 @@ int ssl3_client_hello(SSL *s)
 	buf=(unsigned char *)s->init_buf->data;
 	if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
 		{
-		SSL_SESSION *sess = s->session;
-		if ((sess == NULL) ||
-			(sess->ssl_version != s->version) ||
-#ifdef OPENSSL_NO_TLSEXT
-			!sess->session_id_length ||
-#else
-			(!sess->session_id_length && !sess->tlsext_tick) ||
-#endif
-			(sess->not_resumable))
+		if ((s->session == NULL) ||
+			(s->session->ssl_version != s->version) ||
+			(s->session->not_resumable))
 			{
 			if (!ssl_get_new_session(s,0))
 				goto err;
-- 
cgit v1.2.3