diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-03-06 13:26:15 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-03-06 13:26:15 +0000 |
| commit | 0fbf8b9cea4b4b01b6dd9e43d36d616edaf88f61 (patch) | |
| tree | 504f8abf7cb69ef075a5bd01ea1553b6cdd4e4d6 /ssl/d1_clnt.c | |
| parent | d895f7f0601f2cfc4e539425decafa0283e3f709 (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 299ffb39b6..00cb43f09e 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -330,7 +330,6 @@ int dtls1_connect(SSL *s) if (ret <= 0) goto end; else { - dtls1_stop_timer(s); if (s->hit) { #ifndef OPENSSL_NO_SCTP @@ -441,6 +440,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 |