48ed49e91d
Closes #703 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
22 lines
885 B
Diff
22 lines
885 B
Diff
diff -Nura openssl-0.9.8l/ssl/d1_both.c openssl-0.9.8l-CVE-2009-1378/ssl/d1_both.c
|
|
--- openssl-0.9.8l/ssl/d1_both.c 2007-10-17 18:17:49.000000000 -0300
|
|
+++ openssl-0.9.8l-CVE-2009-1378/ssl/d1_both.c 2009-11-10 13:20:02.000000000 -0300
|
|
@@ -561,7 +561,16 @@
|
|
if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
|
|
goto err;
|
|
|
|
- if (msg_hdr->seq <= s->d1->handshake_read_seq)
|
|
+ /* Try to find item in queue, to prevent duplicate entries */
|
|
+ pq_64bit_init(&seq64);
|
|
+ pq_64bit_assign_word(&seq64, msg_hdr->seq);
|
|
+ item = pqueue_find(s->d1->buffered_messages, seq64);
|
|
+ pq_64bit_free(&seq64);
|
|
+
|
|
+ /* Discard the message if sequence number was already there, is
|
|
+ * too far in the future or the fragment is already in the queue */
|
|
+ if (msg_hdr->seq <= s->d1->handshake_read_seq ||
|
|
+ msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL)
|
|
{
|
|
unsigned char devnull [256];
|
|
|