summaryrefslogtreecommitdiffstats
path: root/ssl/d1_pkt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-05-16 15:51:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-05-16 15:51:59 +0000
commitefa59b8d5957a4e632482280355a92766c4f0f77 (patch)
treed7fb0bd26d95737fad246e44b75d83c2f816dfd3 /ssl/d1_pkt.c
parente1a2bfaaa6dc99ff99e4d181a59d450ab6d233e8 (diff)
Updates from 1.0.0-stable.
Diffstat (limited to 'ssl/d1_pkt.c')
-rw-r--r--ssl/d1_pkt.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index e5b36a38a0..3906019023 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -719,7 +719,14 @@ start:
pitem_free(item);
}
}
-
+
+ /* Check for timeout */
+ if (dtls1_is_timer_expired(s))
+ {
+ if (dtls1_read_failed(s, -1) > 0);
+ goto start;
+ }
+
/* get new packet if necessary */
if ((rr->length == 0) || (s->rstate == SSL_ST_READ_BODY))
{
@@ -1024,7 +1031,7 @@ start:
if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
{
struct ccs_header_st ccs_hdr;
- int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
+ unsigned int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
dtls1_get_ccs_header(rr->data, &ccs_hdr);