diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-03-06 13:24:16 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-03-06 13:24:16 +0000 |
| commit | 9c284f96517d6f9956bf4d7f73971e7a5d410263 (patch) | |
| tree | c69351b7e905f70523169f72dabd1775090e3b24 /ssl/d1_clnt.c | |
| parent | 6d78c381f66245219f5b0a5fa8cd636dddedfd9c (diff) | |
PR: 2748
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Fix possible DTLS timer deadlock.
Diffstat (limited to 'ssl/d1_clnt.c')
| -rw-r--r-- | ssl/d1_clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 1b518d981e..a6ed09c51d 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -329,7 +329,6 @@ int dtls1_connect(SSL *s) if (ret <= 0) goto end; else { - dtls1_stop_timer(s); if (s->hit) { #ifndef OPENSSL_NO_SCTP @@ -440,6 +439,7 @@ int dtls1_connect(SSL *s) case SSL3_ST_CR_SRVR_DONE_B: ret=ssl3_get_server_done(s); if (ret <= 0) goto end; + dtls1_stop_timer(s); if (s->s3->tmp.cert_req) s->s3->tmp.next_state=SSL3_ST_CW_CERT_A; else |