2012-09-19 06:40:34

by Jussi Kivilinna

Subject: [PATCH] crypto: x86/glue_helper - fix storing of new IV in CBC encryption

Glue_helper incorrectly XORs new IV over old IV at end of CBC encryption
function when it should store. This causes CBC encryption to give
incorrect output on multi-page encryption requests.

Signed-off-by: Jussi Kivilinna <[email protected]>
---
arch/x86/crypto/glue_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
index 4854f0f..30b3927 100644
--- a/arch/x86/crypto/glue_helper.c
+++ b/arch/x86/crypto/glue_helper.c
@@ -110,7 +110,7 @@ static unsigned int __glue_cbc_encrypt_128bit(const common_glue_func_t fn,
nbytes -= bsize;
} while (nbytes >= bsize);

- u128_xor((u128 *)walk->iv, (u128 *)walk->iv, iv);
+ *(u128 *)walk->iv = *iv;
return nbytes;
}

2012-09-27 05:31:48

by Herbert Xu

Subject: Re: [PATCH] crypto: x86/glue_helper - fix storing of new IV in CBC encryption

On Wed, Sep 19, 2012 at 09:40:30AM +0300, Jussi Kivilinna wrote:
> Glue_helper incorrectly XORs new IV over old IV at end of CBC encryption
> function when it should store. This causes CBC encryption to give
> incorrect output on multi-page encryption requests.
>
> Signed-off-by: Jussi Kivilinna <[email protected]>

Patch applied to crypto.

Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt