From cca15d6bb80232fe2868e39e44b3fed5e5c1e64a Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 1 Mar 2010 18:46:43 +0000 Subject: openssl: upgrade to 0.9.8m (patch by Peter Wagner) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19939 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/openssl/patches/900-CVE-2009-1387.patch | 53 ------------------------- 1 file changed, 53 deletions(-) delete mode 100644 package/openssl/patches/900-CVE-2009-1387.patch (limited to 'package/openssl/patches/900-CVE-2009-1387.patch') diff --git a/package/openssl/patches/900-CVE-2009-1387.patch b/package/openssl/patches/900-CVE-2009-1387.patch deleted file mode 100644 index 7a2a47e9b..000000000 --- a/package/openssl/patches/900-CVE-2009-1387.patch +++ /dev/null @@ -1,53 +0,0 @@ -http://bugs.gentoo.org/270305 - -fix from upstream - ---- a/ssl/d1_both.c -+++ b/ssl/d1_both.c -@@ -585,30 +585,31 @@ dtls1_process_out_of_seq_message(SSL *s, - } - } - -- frag = dtls1_hm_fragment_new(frag_len); -- if ( frag == NULL) -- goto err; -+ if (frag_len) -+ { -+ frag = dtls1_hm_fragment_new(frag_len); -+ if ( frag == NULL) -+ goto err; - -- memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); -+ memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); - -- if (frag_len) -- { -- /* read the body of the fragment (header has already been read */ -+ /* read the body of the fragment (header has already been read) */ - i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE, - frag->fragment,frag_len,0); - if (i<=0 || (unsigned long)i!=frag_len) - goto err; -- } - -- pq_64bit_init(&seq64); -- pq_64bit_assign_word(&seq64, msg_hdr->seq); -+ pq_64bit_init(&seq64); -+ pq_64bit_assign_word(&seq64, msg_hdr->seq); - -- item = pitem_new(seq64, frag); -- pq_64bit_free(&seq64); -- if ( item == NULL) -- goto err; -+ item = pitem_new(seq64, frag); -+ pq_64bit_free(&seq64); -+ if ( item == NULL) -+ goto err; -+ -+ pqueue_insert(s->d1->buffered_messages, item); -+ } - -- pqueue_insert(s->d1->buffered_messages, item); - return DTLS1_HM_FRAGMENT_RETRY; - - err: -- cgit v1.2.3