diff options
| author | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
| commit | 4b23d4dfa33b09440ffbdfccbd46571649ccecaa (patch) | |
| tree | 02c3b507f3e038c1e191fa97d59562b468e64b65 /main/openssl/openssl-0.9.8l-CVE-2009-1387.patch | |
| parent | e59a787cc0775b8f7f97d492674a257baef45f6d (diff) | |
| parent | 192b8fad759488bbe2fea1b43acda638eb6ebe85 (diff) | |
| download | aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.bz2 aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/openssl/openssl-0.9.8l-CVE-2009-1387.patch')
| -rw-r--r-- | main/openssl/openssl-0.9.8l-CVE-2009-1387.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/main/openssl/openssl-0.9.8l-CVE-2009-1387.patch b/main/openssl/openssl-0.9.8l-CVE-2009-1387.patch deleted file mode 100644 index c8ff15e50..000000000 --- a/main/openssl/openssl-0.9.8l-CVE-2009-1387.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://bugs.gentoo.org/270305 - -fix from upstream - -Index: ssl/d1_both.c -=================================================================== -RCS file: /usr/local/src/openssl/CVSROOT/openssl/ssl/d1_both.c,v -retrieving revision 1.4.2.7 -retrieving revision 1.4.2.8 -diff -u -p -r1.4.2.7 -r1.4.2.8 ---- a/ssl/d1_both.c 17 Oct 2007 21:17:49 -0000 1.4.2.7 -+++ b/ssl/d1_both.c 2 Apr 2009 22:12:13 -0000 1.4.2.8 -@@ -575,30 +575,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: |