diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2008-11-06 08:10:02 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2008-11-06 08:10:02 +0000 |
| commit | c3ecfa6f2d5b18910d31eec15a3c0b34ff2b2115 (patch) | |
| tree | 0e3568679c2e21e68e3adde7de6394aa9198277c /dev-libs/libgcrypt/files | |
| parent | s390 love (diff) | |
| download | gentoo-2-c3ecfa6f2d5b18910d31eec15a3c0b34ff2b2115.tar.gz gentoo-2-c3ecfa6f2d5b18910d31eec15a3c0b34ff2b2115.tar.bz2 gentoo-2-c3ecfa6f2d5b18910d31eec15a3c0b34ff2b2115.zip | |
hash calculation fix as per upstream http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2
(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-libs/libgcrypt/files')
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch | 20 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch | 21 |
2 files changed, 41 insertions, 0 deletions
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) ); + |