Attachment 316379 Details for Bug 461537 – [CRYPTO] hmac: Avoid calling virt_to_page on key

[patch] [CRYPTO] hmac: Avoid calling virt_to_page on key

p (text/plain), 1.50 KB, created by Herbert Xu on 2008-09-11 00:40:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-09-11 00:40:58 UTC

Size: 1.50 KB

patch

obsolete

>commit e8004603595d0b97138664d9417ea4a50c630805
>Author: Herbert Xu <herbert@gondor.apana.org.au>
>Date:   Thu Sep 11 10:39:40 2008 +1000
>
>    [CRYPTO] hmac: Avoid calling virt_to_page on key
>    
>    When HMAC gets a key longer than the block size of the hash, it needs
>    to feed it as input to the hash to reduce it to a fixed length.  As
>    it is HMAC converts the key to a scatter and gather list.  However,
>    this doesn't work on certain platforms if the key is not allocated
>    via kmalloc.  For example, the keys from tcrypt are stored in the
>    rodata section and this causes it to fail with HMAC on x86-64.
>    
>    This patch fixes this by copying the key to memory obtained via
>    kmalloc before hashing it.
>    
>    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
>diff --git a/crypto/hmac.c b/crypto/hmac.c
>index 28a713b..8852797 100644
>--- a/crypto/hmac.c
>+++ b/crypto/hmac.c
>@@ -56,9 +56,24 @@ static int hmac_setkey(struct crypto_hash *parent,
> 
> 	if (keylen > bs) {
> 		struct scatterlist tmp;
>+		int tmplen;
> 
>-		sg_init_one(&tmp, (u8 *)inkey, keylen);
>-		crypto_digest_digest(tfm, &tmp, 1, digest);
>+		crypto_digest_init(tfm);
>+
>+		tmplen = bs * 2 + ds;
>+		sg_init_one(&tmp, ipad, tmplen);
>+
>+		for (; keylen > tmplen; inkey += tmplen, keylen -= tmplen) {
>+			memcpy(ipad, inkey, tmplen);
>+			crypto_digest_update(tfm, &tmp, 1);
>+		}
>+
>+		if (keylen) {
>+			memcpy(ipad, inkey, keylen);
>+			crypto_digest_update(tfm, &tmp, 1);
>+		}
>+
>+		crypto_digest_final(tfm, digest);
> 
> 		inkey = digest;
> 		keylen = ds;

Actions: View | Diff

Attachments on bug 461537: 316194 | 316262 | 316379 | 316380