diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 12:10:12 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 12:10:12 +0000 |
| commit | c6dd154b3e410f72e09ff472fe4e70ebf02173f8 (patch) | |
| tree | e55bf904880067f1e9fcd4acf84676d127779e57 /ssl/s3_srvr.c | |
| parent | 74b5feea7bbe0b8223aabaad04c159709936989f (diff) | |
oops, revert previous patch
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 92f73b6681..3a62a95fa1 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -218,7 +218,7 @@ int ssl3_accept(SSL *s) switch (s->state) { case SSL_ST_RENEGOTIATE: - s->new_session=1; + s->renegotiate=1; /* s->state=SSL_ST_ACCEPT; */ case SSL_ST_BEFORE: @@ -316,7 +316,7 @@ int ssl3_accept(SSL *s) ret=ssl3_get_client_hello(s); if (ret <= 0) goto end; - s->new_session = 2; + s->renegotiate = 2; s->state=SSL3_ST_SW_SRVR_HELLO_A; s->init_num=0; break; @@ -673,11 +673,12 @@ int ssl3_accept(SSL *s) s->init_num=0; - if (s->new_session == 2) /* skipped if we just sent a HelloRequest */ + if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */ { /* actually not necessarily a 'new' session unless * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */ + s->renegotiate=0; s->new_session=0; ssl_update_cache(s,SSL_SESS_CACHE_SERVER); |