diff options
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/s23_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/s2_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/s2_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 1eafb4b..dd2562a 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -113,8 +113,8 @@ int ssl23_connect(SSL *s) else if (s->ctx->info_callback != NULL) cb=s->ctx->info_callback; - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); for (;;) { diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 8c41e1f..fe8bd33 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -165,8 +165,8 @@ int ssl23_accept(SSL *s) else if (s->ctx->info_callback != NULL) cb=s->ctx->info_callback; - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); for (;;) { diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 85b97b6..8cb7388 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -118,8 +118,8 @@ int ssl2_connect(SSL *s) cb=s->ctx->info_callback; /* init things to blank */ - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); for (;;) { diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index f4f1110..f849e2b 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -119,8 +119,8 @@ int ssl2_accept(SSL *s) cb=s->ctx->info_callback; /* init things to blank */ - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); if (s->cert == NULL) { diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 734659d..52dda37 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -119,8 +119,8 @@ int ssl3_connect(SSL *s) else if (s->ctx->info_callback != NULL) cb=s->ctx->info_callback; - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); for (;;) { diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 9cea6e3..8c5b6e8 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -180,8 +180,8 @@ int ssl3_accept(SSL *s) cb=s->ctx->info_callback; /* init things to blank */ - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); if (s->cert == NULL) { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 7257daa..72821a1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -193,7 +193,7 @@ int SSL_clear(SSL *s) #if 1 /* Check to see if we were changed into a different method, if * so, revert back if we are not doing session-id reuse. */ - if ((s->session == NULL) && (s->method != s->ctx->method)) + if (!s->in_handshake && (s->session == NULL) && (s->method != s->ctx->method)) { s->method->ssl_free(s); s->method=s->ctx->method; |