From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 28 Oct 2009 19:48:09 +0000 (+0000)
Subject: PR: 2085
X-Git-Tag: OpenSSL-fips-2_0-rc1~1467
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b57329ba9005298e419b9e6b96ce66cb393010bb;p=oweals%2Fopenssl.git

PR: 2085
Submitted by: Mike Frysinger <vapier@gentoo.org>
Approved by: steve@openssl.org

Change domd test to match 1.0.0+ version: check $MAKEDEPEND
ends in "gcc" to support cross compilers.
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index a62ffd5eb3..9322f629ce 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -618,9 +618,15 @@ int ssl3_client_hello(SSL *s)
 	buf=(unsigned char *)s->init_buf->data;
 	if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
 		{
-		if ((s->session == NULL) ||
-			(s->session->ssl_version != s->version) ||
-			(s->session->not_resumable))
+		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 (!ssl_get_new_session(s,0))
 				goto err;