hash calculation fix as per upstream http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 62 insertions, 6 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 4b8b29c90c42..a0763efbf1f6 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.115 2008/11/03 17:07:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.116 2008/11/06 08:10:02 dragonheart Exp $
+
+*libgcrypt-1.4.3-r1 (06 Nov 2008)
+
+  06 Nov 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch,
+  +files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch, libgcrypt-1.4.0-r1.ebuild,
+  -libgcrypt-1.4.3.ebuild, +libgcrypt-1.4.3-r1.ebuild:
+  hash calculation fix as per upstream
+  http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2
 
 *libgcrypt-1.4.3 (03 Nov 2008)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 7835f7f4de23..98043f1a0754 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,4 +1,6 @@
 AUX libgcrypt-1.2.3-strict-aliasing.patch 756 RMD160 82fb7d364389a6f559036a4b1d963ff2f2e379a3 SHA1 b785b375c7d3fc38d46012f76f5af02a1bd4bd43 SHA256 caed94b7cebebc288c64a3484f1c3213b38c71699f9f06149ab5c8672db1c9b4
+AUX libgcrypt-1.4.0-HMAC-SHA-384-512.patch 668 RMD160 76f7cb661f6521eafc2e6fcf62e0f2f8e9737b3c SHA1 9f1795c0c8c713f6721059774595d254920bf956 SHA256 f72a1259973d6987651b707cef8d59a5c987f0229a8a5b0977745a7b5f40e6a8
+AUX libgcrypt-1.4.3-HMAC-SHA-384-512.patch 796 RMD160 4c485c2f19fc05746f984920fd55d4b9b608b647 SHA1 0cdb189f466af1eb9d658baa0d254b707c154e0a SHA256 a9a9a95c7125460878c34ca8f8c7d46a725ae33588e9ae568ea4190c7091b0e2
 DIST libgcrypt-1.2.1-patches.tar.gz 2631 RMD160 314b601285d48bd57b89dca1e20779256c7ed3e4 SHA1 ff62eb54490e41d40d3d4683359954ce1cb8b5d6 SHA256 f1900ed55883dc8619fd4e5eabe16cb463873884683bbeb9c9a6d9dc53a18ed6
 DIST libgcrypt-1.2.4-idea.diff.bz2 2924 RMD160 199cfb4224b6cebc940f4cfb876deb700e9dc044 SHA1 092458ed8ed3e5fd2230c25b384f05ba99db6d1e SHA256 a3d5db94f50492c27de5b4ce64ae7974c5293012dea730bfb46df948954a6aa9
 DIST libgcrypt-1.2.4.tar.gz 1013625 RMD160 6a5ba284efe48c6963e21d8558a69096aea03d84 SHA1 d279e7a4464cccf0cc4e29c374a1e8325fc65b9a SHA256 cf3c3f313ebeb9165d80439beaeb7f621b73856a2159e4b84c70f32b455fd9ec
@@ -7,8 +9,8 @@ DIST libgcrypt-1.4.0.tar.bz2 964779 RMD160 bccec927cdf0437778d8aa1071b27a871ed5c
 DIST libgcrypt-1.4.1.tar.bz2 969240 RMD160 77439204d3a9310175f55f78daeb86f843ab9eb4 SHA1 367fe7fecd2ed4ab743849279dbc2f7e148f9956 SHA256 fe3b32bdf0c92d6b3bb7b3e4b3c19a6a899a9deb65f1b36f0a5882d308c91fa3
 DIST libgcrypt-1.4.3.tar.bz2 1087215 RMD160 5c66365e23798289fedcd9ea837cb887fa610ff4 SHA1 bdc67c1fdcec464a94dca691615f2335a12db5ce SHA256 88c819bd9f01d7d4818898e133a512044e78c34307aa606b6a94eece7c0b230b
 EBUILD libgcrypt-1.2.4.ebuild 2544 RMD160 35a48352312af0c9478da8aade60d9e7ec9f9e63 SHA1 f0d37e91d20cf95425ea906e8c2cd63c6eb1b0e7 SHA256 050717664812977f96d81fceb8294875b915103d04db2fe55bdf93c200004a31
-EBUILD libgcrypt-1.4.0-r1.ebuild 2312 RMD160 e8584f3d55deea9fad8e75683b5d17393fd1d053 SHA1 bf39fd37b8e8013259e9b77e21119d8a314564f9 SHA256 04de1814ed9a60c04121d96d4472022a64045b4ba4d70f11b1225a15055aa6c8
+EBUILD libgcrypt-1.4.0-r1.ebuild 2425 RMD160 b700a295fa4c698a67bb6aa12bb21f5df3224c02 SHA1 003ded2ab72e83bebf2b75d440fdc016e6395a42 SHA256 ba98aaab842d8e53738365382c99d90db892f3a75eceeecaf84a8ba9a29d016d
 EBUILD libgcrypt-1.4.1.ebuild 2330 RMD160 43e652787b3068567289449853f8b570e149f433 SHA1 54632f47b5852fa8c0602e10441f8d6f5f446548 SHA256 e92ee7a14f5a5cc66431c43cd70740782193dee420532b559c9ef96fb65d8b94
-EBUILD libgcrypt-1.4.3.ebuild 2318 RMD160 be3b948525e856f1b65ea4be66e5a7a00aaaab77 SHA1 deb1f4ade9338a20655978a61726907368656809 SHA256 611d70738e2cd26bcc0ef748095e39501183190066c16cae3a0e78f232911d82
-MISC ChangeLog 16374 RMD160 3c91c138a20e380edc938bad2a244efddb99fbb0 SHA1 72247c450d5a0422fa273ec078dc39197d7f58d7 SHA256 99b270a95273bb5df6f4e4268ba5b347dfa5444ae315632bfddcd9c807223095
+EBUILD libgcrypt-1.4.3-r1.ebuild 2429 RMD160 af1138dcd4f526911f9984a3209239a032196be1 SHA1 e326ca1eb44dfd35242d6d21e85213c4f13bf523 SHA256 26d1b72066fdb54a7c0a981b3b628f12ef02ae3315a792c5180b5d19ad492b7d
+MISC ChangeLog 16739 RMD160 9eb1cba25f7562b2df106254e88ff42a04b251a8 SHA1 946baf7d7ccea32c36047e5799b69b141f6db4c6 SHA256 3a77127492a1273c3156785a2307ce78a521e47273322679371104ed21f51c26
 MISC metadata.xml 231 RMD160 f55939ecfa9103e22ed6f3b0ace3f26fa8050417 SHA1 bb40ba62bd4eb3785818e820af5678eac394511b SHA256 3742bb789b2248572a4afcc61839d8d4e833d5c0a38d26c8eadb764dd18acfaf
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch b/dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch
new file mode 100644
index 000000000000..6841fce90a27
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch
@@ -0,0 +1,20 @@
+--- cipher/md.c.orig	2007-08-14 02:46:51.000000000 +1000
++++ cipher/md.c	2008-11-06 19:05:37.000000000 +1100
+@@ -791,7 +791,7 @@
+   if ( !algo )
+     return GPG_ERR_DIGEST_ALGO; /* i.e. no algo enabled */
+ 
+-  if ( keylen > 64 ) 
++  if ( keylen > hd->ctx->macpads_Bsize ) 
+     {
+       helpkey = gcry_malloc_secure ( md_digest_length( algo ) );
+       if ( !helpkey )
+@@ -799,7 +799,7 @@
+       gcry_md_hash_buffer ( algo, helpkey, key, keylen );
+       key = helpkey;
+       keylen = md_digest_length( algo );
+-      assert ( keylen <= 64 );
++      assert ( keylen <= hd->ctx->macpads_Bsize );
+     }
+ 
+   memset ( hd->ctx->macpads, 0, 2*(hd->ctx->macpads_Bsize) );
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch b/dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch
new file mode 100644
index 000000000000..e9146b9085a0
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch
@@ -0,0 +1,21 @@
+--- orig/libgcrypt-1.4.3/cipher/md.c    2008-09-12 15:43:52.000000000 +0200
++++ libgcrypt-1.4.3/cipher/md.c 2008-11-05 19:52:32.000000000 +0100
+@@ -834,7 +834,7 @@ prepare_macpads( gcry_md_hd_t hd, const 
+   if ( !algo )
+     return GPG_ERR_DIGEST_ALGO; /* i.e. no algo enabled */
+ 
+-  if ( keylen > 64 ) 
++  if ( keylen > hd->ctx->macpads_Bsize ) 
+     {
+       helpkey = gcry_malloc_secure ( md_digest_length( algo ) );
+       if ( !helpkey )
+@@ -842,7 +842,7 @@ prepare_macpads( gcry_md_hd_t hd, const 
+       gcry_md_hash_buffer ( algo, helpkey, key, keylen );
+       key = helpkey;
+       keylen = md_digest_length( algo );
+-      gcry_assert ( keylen <= 64 );
++      gcry_assert ( keylen <= hd->ctx->macpads_Bsize );
+     }
+ 
+   memset ( hd->ctx->macpads, 0, 2*(hd->ctx->macpads_Bsize) );
+
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
index 53c70db7511f..d862b462614f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild,v 1.10 2008/01/31 15:00:42 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild,v 1.11 2008/11/06 08:10:02 dragonheart Exp $
 
 inherit eutils autotools
 
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2
+	epatch "${FILESDIR}"/${P}-HMAC-SHA-384-512.patch
 
 	if use idea; then
 		if use bindist; then
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.3-r1.ebuild
index 44180d131f1c..4535fc9a79a0 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.4.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.4.3.ebuild,v 1.1 2008/11/03 17:07:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.4.3-r1.ebuild,v 1.1 2008/11/06 08:10:02 dragonheart Exp $
 
 inherit autotools eutils
 
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2
+	epatch "${FILESDIR}"/${P}-HMAC-SHA-384-512.patch
 
 	if use idea; then
 		if use bindist; then