ar71xx: select vsc73x5 microcode in the AP83/PB44 profiles

[openwrt.git] / package / openssl / patches / 900-CVE-2009-1377.patch

diff --git a/package/openssl/patches/900-CVE-2009-1377.patch b/package/openssl/patches/900-CVE-2009-1377.patch
index cc5a19f..8b8faf4 100644 (file)
--- a/package/openssl/patches/900-CVE-2009-1377.patch
+++ b/package/openssl/patches/900-CVE-2009-1377.patch
@@ -1,11 +1,8 @@
 http://rt.openssl.org/Ticket/Display.html?id=1931&user=guest&pass=guest
 
 http://rt.openssl.org/Ticket/Display.html?id=1931&user=guest&pass=guest
 

-Index: openssl/crypto/pqueue/pqueue.c
-RCS File: /v/openssl/cvs/openssl/crypto/pqueue/pqueue.c,v
-rcsdiff -q -kk '-r1.2.2.4' '-r1.2.2.5' -u '/v/openssl/cvs/openssl/crypto/pqueue/pqueue.c,v' 2>/dev/null
---- pqueue.c   2005/06/28 12:53:33     1.2.2.4
-+++ pqueue.c   2009/05/16 16:18:44     1.2.2.5
-@@ -234,3 +234,17 @@
+--- a/crypto/pqueue/pqueue.c
++++ b/crypto/pqueue/pqueue.c
+@@ -234,3 +234,17 @@ pqueue_next(pitem **item)

  
        return ret;
        }
  
        return ret;
        }


@@ -23,24 +20,18 @@ rcsdiff -q -kk '-r1.2.2.4' '-r1.2.2.5' -u '/v/openssl/cvs/openssl/crypto/pqueue/
 +      }
 +      return count;
 +}
 +      }
 +      return count;
 +}

-Index: openssl/crypto/pqueue/pqueue.h
-RCS File: /v/openssl/cvs/openssl/crypto/pqueue/pqueue.h,v
-rcsdiff -q -kk '-r1.2.2.1' '-r1.2.2.2' -u '/v/openssl/cvs/openssl/crypto/pqueue/pqueue.h,v' 2>/dev/null
---- pqueue.h   2005/05/30 22:34:27     1.2.2.1
-+++ pqueue.h   2009/05/16 16:18:44     1.2.2.2
-@@ -91,5 +91,6 @@
+--- a/crypto/pqueue/pqueue.h
++++ b/crypto/pqueue/pqueue.h
+@@ -91,5 +91,6 @@ pitem *pqueue_iterator(pqueue pq);

  pitem *pqueue_next(piterator *iter);
  
  void   pqueue_print(pqueue pq);
 +int    pqueue_size(pqueue pq);
  
  #endif /* ! HEADER_PQUEUE_H */
  pitem *pqueue_next(piterator *iter);
  
  void   pqueue_print(pqueue pq);
 +int    pqueue_size(pqueue pq);
  
  #endif /* ! HEADER_PQUEUE_H */

-Index: openssl/ssl/d1_pkt.c
-RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
-rcsdiff -q -kk '-r1.4.2.17' '-r1.4.2.18' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
---- d1_pkt.c   2009/05/16 15:51:59     1.4.2.17
-+++ d1_pkt.c   2009/05/16 16:18:45     1.4.2.18
-@@ -167,6 +167,10 @@
+--- a/ssl/d1_pkt.c
++++ b/ssl/d1_pkt.c
+@@ -167,6 +167,10 @@ dtls1_buffer_record(SSL *s, record_pqueu

      DTLS1_RECORD_DATA *rdata;
        pitem *item;
  
      DTLS1_RECORD_DATA *rdata;
        pitem *item;