| 1 |
dragonheart 08/11/06 08:10:02 |
| 2 |
|
| 3 |
Added: libgcrypt-1.4.0-HMAC-SHA-384-512.patch |
| 4 |
libgcrypt-1.4.3-HMAC-SHA-384-512.patch |
| 5 |
Log: |
| 6 |
hash calculation fix as per upstream http://marc.info/?l=gcrypt-devel&m=122591162816263&w=2 |
| 7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libgcrypt/files/libgcrypt-1.4.0-HMAC-SHA-384-512.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libgcrypt-1.4.0-HMAC-SHA-384-512.patch |
| 16 |
=================================================================== |
| 17 |
--- cipher/md.c.orig 2007-08-14 02:46:51.000000000 +1000 |
| 18 |
+++ cipher/md.c 2008-11-06 19:05:37.000000000 +1100 |
| 19 |
@@ -791,7 +791,7 @@ |
| 20 |
if ( !algo ) |
| 21 |
return GPG_ERR_DIGEST_ALGO; /* i.e. no algo enabled */ |
| 22 |
|
| 23 |
- if ( keylen > 64 ) |
| 24 |
+ if ( keylen > hd->ctx->macpads_Bsize ) |
| 25 |
{ |
| 26 |
helpkey = gcry_malloc_secure ( md_digest_length( algo ) ); |
| 27 |
if ( !helpkey ) |
| 28 |
@@ -799,7 +799,7 @@ |
| 29 |
gcry_md_hash_buffer ( algo, helpkey, key, keylen ); |
| 30 |
key = helpkey; |
| 31 |
keylen = md_digest_length( algo ); |
| 32 |
- assert ( keylen <= 64 ); |
| 33 |
+ assert ( keylen <= hd->ctx->macpads_Bsize ); |
| 34 |
} |
| 35 |
|
| 36 |
memset ( hd->ctx->macpads, 0, 2*(hd->ctx->macpads_Bsize) ); |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libgcrypt/files/libgcrypt-1.4.3-HMAC-SHA-384-512.patch?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: libgcrypt-1.4.3-HMAC-SHA-384-512.patch |
| 46 |
=================================================================== |
| 47 |
--- orig/libgcrypt-1.4.3/cipher/md.c 2008-09-12 15:43:52.000000000 +0200 |
| 48 |
+++ libgcrypt-1.4.3/cipher/md.c 2008-11-05 19:52:32.000000000 +0100 |
| 49 |
@@ -834,7 +834,7 @@ prepare_macpads( gcry_md_hd_t hd, const |
| 50 |
if ( !algo ) |
| 51 |
return GPG_ERR_DIGEST_ALGO; /* i.e. no algo enabled */ |
| 52 |
|
| 53 |
- if ( keylen > 64 ) |
| 54 |
+ if ( keylen > hd->ctx->macpads_Bsize ) |
| 55 |
{ |
| 56 |
helpkey = gcry_malloc_secure ( md_digest_length( algo ) ); |
| 57 |
if ( !helpkey ) |
| 58 |
@@ -842,7 +842,7 @@ prepare_macpads( gcry_md_hd_t hd, const |
| 59 |
gcry_md_hash_buffer ( algo, helpkey, key, keylen ); |
| 60 |
key = helpkey; |
| 61 |
keylen = md_digest_length( algo ); |
| 62 |
- gcry_assert ( keylen <= 64 ); |
| 63 |
+ gcry_assert ( keylen <= hd->ctx->macpads_Bsize ); |
| 64 |
} |
| 65 |
|
| 66 |
memset ( hd->ctx->macpads, 0, 2*(hd->ctx->macpads_Bsize) ); |
Archives