diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-05-15 22:58:40 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-05-15 22:58:40 +0000 |
commit | eb38b26dbc2dd15bb6e0a351d0826e7da09b1782 (patch) | |
tree | 27a2a66a97074df6415795e74941bde9a8e8a87a /ssl/d1_both.c | |
parent | 8bbe29f2ca63dc955e3daf854f931acb04a733e6 (diff) |
Update from 1.0.0-stable.
Diffstat (limited to 'ssl/d1_both.c')
-rw-r--r-- | ssl/d1_both.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 8883760da5..928a005e53 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -883,7 +883,6 @@ unsigned long dtls1_output_cert_chain(SSL *s, X509 *x) int dtls1_read_failed(SSL *s, int code) { DTLS1_STATE *state; - BIO *bio; int send_alert = 0; if ( code > 0) @@ -892,8 +891,7 @@ int dtls1_read_failed(SSL *s, int code) return 1; } - bio = SSL_get_rbio(s); - if ( ! BIO_dgram_recv_timedout(bio)) + if (!dtls1_is_timer_expired(s)) { /* not a timeout, none of our business, let higher layers handle this. in fact it's probably an error */ @@ -906,6 +904,7 @@ int dtls1_read_failed(SSL *s, int code) return code; } + dtls1_double_timeout(s); state = s->d1; state->timeout.num_alerts++; if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT) |