summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-10-28 19:50:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-10-28 19:50:59 +0000
commit3e24d439313e04a1f2543e0a06c9d91a87264a7c (patch)
tree7477ca1138f5613e13aaa82e92a9b42612f84153 /ssl
parentb57329ba9005298e419b9e6b96ce66cb393010bb (diff)
oops!
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_clnt.c12
1 files 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;