diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-02-28 17:47:33 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-02-28 17:47:33 +0300 |
| commit | b98a984294599c9870805146962a9401e27f4629 (patch) | |
| tree | d15a16e693f6e8d502c9b739b0e2ffcdb7adc250 /ssl | |
| parent | dac709846418c38a3fe632c8d26adc94bde0e280 (diff) | |
Merge in changes from the 0.9.6-stable branch.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 24cec2afe5..4f84a3476d 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -85,7 +85,6 @@ OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={ int SSL_clear(SSL *s) { - int state; if (s->method == NULL) { @@ -93,6 +92,12 @@ int SSL_clear(SSL *s) return(0); } + if (ssl_clear_bad_session(s)) + { + SSL_SESSION_free(s->session); + s->session=NULL; + } + s->error=0; s->hit=0; s->shutdown=0; @@ -110,7 +115,6 @@ int SSL_clear(SSL *s) } #endif - state=s->state; /* Keep to check if we throw away the session-id */ s->type=0; s->state=SSL_ST_BEFORE|((s->server)?SSL_ST_ACCEPT:SSL_ST_CONNECT); @@ -131,12 +135,6 @@ int SSL_clear(SSL *s) ssl_clear_cipher_ctx(s); - if (ssl_clear_bad_session(s)) - { - SSL_SESSION_free(s->session); - s->session=NULL; - } - s->first_packet=0; #if 1 |