diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-05-16 15:51:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-05-16 15:51:59 +0000 |
| commit | efa59b8d5957a4e632482280355a92766c4f0f77 (patch) | |
| tree | d7fb0bd26d95737fad246e44b75d83c2f816dfd3 /ssl/d1_both.c | |
| parent | e1a2bfaaa6dc99ff99e4d181a59d450ab6d233e8 (diff) | |
Updates 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 9a2cdb2fb1..5727c73776 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -885,7 +885,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) @@ -894,8 +893,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 */ @@ -908,6 +906,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) |