diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-04-14 13:26:50 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-04-14 13:26:50 +0000 |
| commit | 82687bb4c3b462bc2324eefe927a9f557aef1da7 (patch) | |
| tree | fa0d64f95130012d612b3d22fec056e3f5ff97ef /ssl/d1_both.c | |
| parent | 6506b7754afa96473d552f2e4fd9ab4052918cd7 (diff) | |
PR: 2230
Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>
Fixed various DTLS fragment reassembly bugs patch for 0.9.8.
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index aa3ca8e101..816abe378e 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -599,7 +599,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok) hm_fragment *frag = NULL; pitem *item = NULL; int i = -1, is_complete; - unsigned char seq64be[8]; + PQ_64BIT seq64; unsigned long frag_len = msg_hdr->frag_len, max_len; if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len) @@ -617,10 +617,10 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok) goto err; /* Try to find item in queue */ - memset(seq64be,0,sizeof(seq64be)); - seq64be[6] = (unsigned char) (msg_hdr->seq>>8); - seq64be[7] = (unsigned char) msg_hdr->seq; - item = pqueue_find(s->d1->buffered_messages, seq64be); + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pqueue_find(s->d1->buffered_messages, seq64); + pq_64bit_free(&seq64); if (item == NULL) { @@ -672,11 +672,11 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok) if (item == NULL) { - memset(seq64be,0,sizeof(seq64be)); - seq64be[6] = (unsigned char)(msg_hdr->seq>>8); - seq64be[7] = (unsigned char)(msg_hdr->seq); + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pitem_new(seq64, frag); + pq_64bit_free(&seq64); - item = pitem_new(seq64be, frag); if (item == NULL) { goto err; |