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

[Kurt Roeckx]

Author: kroeckx
Date: 2010-02-28 21:10:03 +0000 (Sun, 28 Feb 2010)
New Revision: 449

Added:
   openssl/trunk/debian/patches/cfb.diff
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
* Revert CFB block length change preventing reading older files.
  (Closes: #571810, #571940)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2010-02-27 13:46:02 UTC (rev 448)
+++ openssl/trunk/debian/changelog	2010-02-28 21:10:03 UTC (rev 449)
@@ -1,3 +1,10 @@
+openssl (0.9.8m-2) unstable; urgency=low
+
+  * Revert CFB block length change preventing reading older files.
+    (Closes: #571810, #571940)
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Sun, 28 Feb 2010 22:08:49 +0100
+
 openssl (0.9.8m-1) unstable; urgency=low
 
   * New upstream version

Added: openssl/trunk/debian/patches/cfb.diff
===================================================================
--- openssl/trunk/debian/patches/cfb.diff	                        (rev 0)
+++ openssl/trunk/debian/patches/cfb.diff	2010-02-28 21:10:03 UTC (rev 449)
@@ -0,0 +1,19 @@
+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-02-27 13:46:02 UTC (rev 448)
+++ openssl/trunk/debian/patches/series	2010-02-28 21:10:03 UTC (rev 449)
@@ -18,3 +18,4 @@
 stddef.patch
 version-script.patch
 perl-path.diff
+cfb.diff