[Pkg-openssl-changes] r543 - openssl/branches/squeeze/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2012-03-17 15:10:24 +0000 (Sat, 17 Mar 2012)
New Revision: 543

Modified:
   openssl/branches/squeeze/debian/patches/CVE-2012-1165.patch
Log:
Make CVE-2012-1165.patch apply


Modified: openssl/branches/squeeze/debian/patches/CVE-2012-1165.patch
===================================================================
--- openssl/branches/squeeze/debian/patches/CVE-2012-1165.patch	2012-03-17 14:56:44 UTC (rev 542)
+++ openssl/branches/squeeze/debian/patches/CVE-2012-1165.patch	2012-03-17 15:10:24 UTC (rev 543)
@@ -1,21 +1,17 @@
-Index: openssl/crypto/asn1/asn_mime.c
-RCS File: /v/openssl/cvs/openssl/crypto/asn1/asn_mime.c,v
-rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/openssl/cvs/openssl/crypto/asn1/asn_mime.c,v' 2>/dev/null
---- asn_mime.c	2012/02/29 14:02:02	1.7
-+++ asn_mime.c	2012/03/12 16:32:19	1.8
-@@ -862,9 +862,8 @@
+Index: openssl-0.9.8o/crypto/asn1/asn_mime.c
+===================================================================
+--- openssl-0.9.8o.orig/crypto/asn1/asn_mime.c	2009-03-08 23:05:34.000000000 +0000
++++ openssl-0.9.8o/crypto/asn1/asn_mime.c	2012-03-17 15:09:03.000000000 +0000
+@@ -790,12 +790,17 @@
  static int mime_hdr_cmp(const MIME_HEADER * const *a,
  			const MIME_HEADER * const *b)
  {
--	if ((*a)->name == NULL || (*b)->name == NULL)
--		return (*a)->name - (*b)->name < 0 ? -1 :
--			(*a)->name - (*b)->name > 0 ? 1 : 0;
 +	if (!(*a)->name || !(*b)->name)
 +		return !!(*a)->name - !!(*b)->name;
- 
++
  	return(strcmp((*a)->name, (*b)->name));
  }
-@@ -872,6 +871,8 @@
+ 
  static int mime_param_cmp(const MIME_PARAM * const *a,
  			const MIME_PARAM * const *b)
  {