diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 11:57:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 11:57:42 +0000 |
| commit | 35cae95032c71cd3523d38246401a1b7d7a74c37 (patch) | |
| tree | a780edc644d51044291f66e35a05f7bd039c677e /ssl/d1_srvr.c | |
| parent | 11a36aa96f055c5d1ea8a762b1f9c1ab22e32425 (diff) | |
PR: 1833
Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>
Fix other cases not covered by original patch.
Diffstat (limited to 'ssl/d1_srvr.c')
| -rw-r--r-- | ssl/d1_srvr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index ac4fbda3a6..301ceda7a5 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -177,7 +177,7 @@ int dtls1_accept(SSL *s) switch (s->state) { case SSL_ST_RENEGOTIATE: - s->renegotiate=1; + s->new_session=1; /* s->state=SSL_ST_ACCEPT; */ case SSL_ST_BEFORE: @@ -299,7 +299,7 @@ int dtls1_accept(SSL *s) case SSL3_ST_SW_SRVR_HELLO_A: case SSL3_ST_SW_SRVR_HELLO_B: - s->renegotiate = 2; + s->new_session = 2; dtls1_start_timer(s); ret=dtls1_send_server_hello(s); if (ret <= 0) goto end; @@ -620,12 +620,11 @@ int dtls1_accept(SSL *s) s->init_num=0; - if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */ + if (s->new_session == 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); |