Subject: [PATCH] [crypto] s390-aes: use correct encrypt/decrypt function in fallback

crypto_blkcipher_decrypt is wrong because it does not care about
the IV.

Signed-off-by: Sebastian Siewior <[email protected]>
---
arch/s390/crypto/aes_s390.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 8524611..46c9705 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -234,13 +234,10 @@ static int fallback_blk_dec(struct blkcipher_desc *desc,
struct crypto_blkcipher *tfm;
struct s390_aes_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);

- memcpy(crypto_blkcipher_crt(sctx->fallback.blk)->iv, desc->info,
- AES_BLOCK_SIZE);
-
tfm = desc->tfm;
desc->tfm = sctx->fallback.blk;

- ret = crypto_blkcipher_decrypt(desc, dst, src, nbytes);
+ ret = crypto_blkcipher_decrypt_iv(desc, dst, src, nbytes);

desc->tfm = tfm;
return ret;
@@ -254,13 +251,10 @@ static int fallback_blk_enc(struct blkcipher_desc *desc,
struct crypto_blkcipher *tfm;
struct s390_aes_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);

- memcpy(crypto_blkcipher_crt(sctx->fallback.blk)->iv, desc->info,
- AES_BLOCK_SIZE);
-
tfm = desc->tfm;
desc->tfm = sctx->fallback.blk;

- ret = crypto_blkcipher_encrypt(desc, dst, src, nbytes);
+ ret = crypto_blkcipher_encrypt_iv(desc, dst, src, nbytes);

desc->tfm = tfm;
return ret;
--
1.5.3.4


2007-12-10 07:50:03

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] [crypto] s390-aes: use correct encrypt/decrypt function in fallback

On Sat, Dec 08, 2007 at 01:42:30PM +0100, Sebastian Siewior wrote:
> crypto_blkcipher_decrypt is wrong because it does not care about
> the IV.
>
> Signed-off-by: Sebastian Siewior <[email protected]>

Also applied.
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt