[Pkg-openssl-changes] r441 - openssl/trunk/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2010-01-13 20:37:29 +0000 (Wed, 13 Jan 2010)
New Revision: 441

Modified:
   openssl/trunk/debian/patches/CVE-2009-4355.patch
Log:
Make it apply.


Modified: openssl/trunk/debian/patches/CVE-2009-4355.patch
===================================================================
--- openssl/trunk/debian/patches/CVE-2009-4355.patch	2010-01-13 20:31:01 UTC (rev 440)
+++ openssl/trunk/debian/patches/CVE-2009-4355.patch	2010-01-13 20:37:29 UTC (rev 441)
@@ -6,13 +6,10 @@
 CRYPTO_cleanup_all_ex_data() is called. If the compression structure is
 cleaned up directly this problem is avoided:
 
-Index: crypto/comp/c_zlib.c
+Index: openssl-0.9.8k/crypto/comp/c_zlib.c
 ===================================================================
-RCS file: /v/openssl/cvs/openssl/crypto/comp/c_zlib.c,v
-retrieving revision 1.22
-diff -u -r1.22 c_zlib.c
---- crypto/comp/c_zlib.c	13 Dec 2008 17:19:40 -0000	1.22
-+++ crypto/comp/c_zlib.c	8 Jan 2010 23:56:13 -0000
+--- openssl-0.9.8k.orig/crypto/comp/c_zlib.c	2010-01-13 20:35:47.000000000 +0000
++++ openssl-0.9.8k/crypto/comp/c_zlib.c	2010-01-13 20:35:50.000000000 +0000
 @@ -136,15 +136,6 @@
  
  static int zlib_stateful_ex_idx = -1;
@@ -51,4 +48,3 @@
  			CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
  			if (zlib_stateful_ex_idx == -1)
  				goto err;
-