Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2d74d405fc5ea78b20a4a2efd24201db424e07b1
Commit: 2d74d405fc5ea78b20a4a2efd24201db424e07b1
Parent: fdc520aa693d462f4958339534a3b596f95795b7
Author: Sebastian Siewior <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 10 15:49:41 2007 +0800
Committer: Herbert Xu <[EMAIL PROTECTED]>
CommitDate: Fri Jan 11 08:16:37 2008 +1100
[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]>
Signed-off-by: Herbert Xu <[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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
