[Pkg-openssl-changes] r452 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2010-03-25 19:44:48 +0000 (Thu, 25 Mar 2010)
New Revision: 452

Removed:
   openssl/trunk/debian/patches/cfb.diff
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Drop cfb.patch, applied upstream.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2010-03-25 19:37:43 UTC (rev 451)
+++ openssl/trunk/debian/changelog	2010-03-25 19:44:48 UTC (rev 452)
@@ -1,7 +1,8 @@
-openssl (0.9.8n-1) unstable; urgency=low
+openssl (0.9.8n-1) unstable; urgency=high
 
   * New upstream version.
     - Fixes CVE-2010-0740.
+    - Drop cfb.patch, applied upstream.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Thu, 25 Mar 2010 20:30:52 +0100
 

Deleted: openssl/trunk/debian/patches/cfb.diff
===================================================================
--- openssl/trunk/debian/patches/cfb.diff	2010-03-25 19:37:43 UTC (rev 451)
+++ openssl/trunk/debian/patches/cfb.diff	2010-03-25 19:44:48 UTC (rev 452)
@@ -1,19 +0,0 @@
-From: Kurt Roeckx <kurt at roeckx.be>
-Subject: Revert CFB block length change preventing reading older files.
-Bug-Debian: http://bugs.debian.org/571810
-
---- openssl/crypto/evp/evp_locl.h
-+++ openssl/crypto/evp/evp_locl.h
-@@ -127,9 +127,9 @@ BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \
- #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
- 			     iv_len, cbits, flags, init_key, cleanup, \
- 			     set_asn1, get_asn1, ctrl) \
--BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
--			(cbits + 7)/8, key_len, iv_len, \
--		flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
-+BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
-+		  key_len, iv_len, flags, init_key, cleanup, set_asn1, \
-+		  get_asn1, ctrl)
- 
- #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
- 			     iv_len, cbits, flags, init_key, cleanup, \

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2010-03-25 19:37:43 UTC (rev 451)
+++ openssl/trunk/debian/patches/series	2010-03-25 19:44:48 UTC (rev 452)
@@ -18,4 +18,3 @@
 stddef.patch
 version-script.patch
 perl-path.diff
-cfb.diff