fix critical bug #308123, thanks Joost Ruis for reporting

Package-Manager: portage-2.2_rc64/cvs/Linux x86_64

4 files changed, 27 insertions, 14 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 4af67919a54d..ea3338521d34 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.320 2010/03/05 21:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.321 2010/03/09 13:25:30 lxnay Exp $
+
+*openssl-0.9.8m-r1 (09 Mar 2010)
+
+  09 Mar 2010; Fabio Erculiani <lxnay@gentoo.org> -openssl-0.9.8m.ebuild,
+  +openssl-0.9.8m-r1.ebuild, +files/openssl-0.9.8m-cfb.patch:
+  fix critical bug #308123, thanks Joost Ruis for reporting
 
 *openssl-0.9.8m (05 Mar 2010)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 771cedb7b578..2afdf13f9355 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
 AUX openssl-0.9.8-make-engines-dir.patch 440 RMD160 0e7d4fd52c9deaf46809fa2b3c62c9096ad08197 SHA1 d4757620437fabb5ec506ce3a74b802fd530f647 SHA256 af1b1f68c8fe77283abf05068ff0c08d28d94e35754c8eee7c76b3006825026a
@@ -20,18 +17,12 @@ AUX openssl-0.9.8l-CVE-2009-2409.patch 2224 RMD160 3283173440e957d2a1fa9c65e6a6d
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8l-dtls-compat.patch 6141 RMD160 87d25f9b1e3ebbee2b3f168510e160bfeba5e2b3 SHA1 fe20d1d695df7fc3a87a264819305c7f40adc3d9 SHA256 440217a7b34dbc5eafc063bf6a3d9208dca1a8e673dcf0345759e898f0940ace
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
+AUX openssl-0.9.8m-cfb.patch 716 RMD160 fa56649ead8d7243f4be01d2e081f092b0664ead SHA1 bbd603510de2de075219ff2fe25484e330a2fb19 SHA256 bf71b7d0624651e48c91ba05990bf8cd70b3dad7153217a7cfb69b514e1f30ab
 DIST openssl-0.9.8l.tar.gz 4179422 RMD160 9de81ec2583edcba729e62d50fd22c0a98a52903 SHA1 d3fb6ec89532ab40646b65af179bb1770f7ca28f SHA256 ecd054e9eed2e9c1620ba15257e6fc4d882c9a4aea663d23b769e2138de8c91a
 DIST openssl-0.9.8m.tar.gz 3767604 RMD160 0296af151993008526b4f2b3a6810e20c4ad3759 SHA1 2511c709a47f34d5fa6cd1a1c9cb1699bdffa912 SHA256 36037160281cf4977d964e403d2bc0680fbca0a7ff9f65e33136d75fae12cb5b
 DIST openssl-1.0.0-beta5.tar.gz 4006467 RMD160 b6e351973a6d41d5f1834ec3b0fdfd7d4973f3a1 SHA1 a16377c02625f803a5dcfaa9c11aeadcfd3703b6 SHA256 499adac5ab67741215ca9ccc1b54b8a1eaa2c90da8971b9babdf7e12ae12155f
 EBUILD openssl-0.9.8l-r2.ebuild 6196 RMD160 e99f82df485bd234e207f9730eaf08a8dbd64e83 SHA1 54160505698cf4812cef7b57314ccf4e289b245b SHA256 750fa447190f467bd56f88e5469e12878bc3962a864f245b2c5c92d655ee215c
-EBUILD openssl-0.9.8m.ebuild 5684 RMD160 ae856919cfa4b293874801895c792e84d84636aa SHA1 022ec7899966bb5a615d8b817e0cd64cb54ecc43 SHA256 d1b53b15f17dc9036e6f9686a22f39bfdc352030af2c3bcf658764284373c437
+EBUILD openssl-0.9.8m-r1.ebuild 5739 RMD160 f313671216e1aa68926b2da989f92f97f19826a4 SHA1 1be6423a387d169a4f4fdcbc10bd7cd5cdb4e14a SHA256 16e01254c9078e06b84c64f9ae7fb93d81e4e19b8bb46d0379d764e6d81b20c6
 EBUILD openssl-1.0.0_beta5.ebuild 5359 RMD160 129700062b0705fa579944ed4933aed2594a00d2 SHA1 e5020560e9cc0881497882f134c8759ae2938fef SHA256 f2490f939a3b0fde8ecce27bade76be1e86e92546b222fac84b6833fe967d9fd
-MISC ChangeLog 47986 RMD160 95fed72cbe5ab8f117e39032608738cd527e0faa SHA1 bb738ed2d608f92bd63735349167743f74b64bdf SHA256 1ff6b24568883593c70b6a021ee8df6de30e6972678740bd56261a3bbe62f36f
+MISC ChangeLog 48216 RMD160 b2ef0ad52b87cadb71ca0ceed41170b4cf388430 SHA1 490473e8d96a0aeb3dfe97822da94dedf1ead155 SHA256 6a0864e656a5ac06d897b40afba9e1d1d686b2439beca94816ee3b2adb773c8d
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkuRewsACgkQTwhj9JtAlp73jQD/cgM4x9Xkri84QdBuEc+p6ppy
-ew+gCJHFEhlY2m8pWewA/23N0uEFKyzbEfL94TNVTuYSVN2I/LyHIddTcJCN6J2l
-=UyB+
------END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch b/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch
new file mode 100644
index 000000000000..9835b93c314a
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.8m-cfb.patch
@@ -0,0 +1,15 @@
+--- crypto/evp/evp_locl.h	2010/02/15 19:40:45	1.10.2.7
++++ crypto/evp/evp_locl.h	2010/02/26 14:41:38	1.10.2.8
+@@ -127,9 +127,9 @@
+ #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, \
diff --git a/dev-libs/openssl/openssl-0.9.8m.ebuild b/dev-libs/openssl/openssl-0.9.8m-r1.ebuild
index f5a027e7c1e2..fc684cf17a52 100644
--- a/dev-libs/openssl/openssl-0.9.8m.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8m-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8m.ebuild,v 1.1 2010/03/05 21:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8m-r1.ebuild,v 1.1 2010/03/09 13:25:30 lxnay Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -31,6 +31,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
 	epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
+	epatch "${FILESDIR}"/${PN}-0.9.8m-cfb.patch #308123
 
 	# disable fips in the build
 	# make sure the man pages are suffixed #302165