Revert "crypto: crypto4xx - properly set IV after de- and encrypt"

This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584 which is
commit fc340115ffb8235c1bbd200c28855e6373d0dd1a upstream.

Hauke writes that this breaks the build and should be reverted.

Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Christian Lamparter <chunkeey@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c
index e3b8bebfdd304b6356aa87d8104f4cb9fc1a5121..4afca396877335653ae8f6f902d1bcdf5b3b9db3 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_alg.c
+++ b/drivers/crypto/amcc/crypto4xx_alg.c
@@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct crypto_ablkcipher *cipher,
        sa = (struct dynamic_sa_ctl *) ctx->sa_in;
        ctx->hash_final = 0;
 
-       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
-                                SA_SAVE_IV : SA_NOT_SAVE_IV),
+       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
                                 SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
                                 SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,
                                 SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 1e810f5f03fa58ae59f8bfd77588ac53e6944676..78d0722feacb59070bfd08d2bce4b4a1b4bbd892 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -645,15 +645,6 @@ static u32 crypto4xx_ablkcipher_done(struct crypto4xx_device *dev,
                addr = dma_map_page(dev->core_dev->device, sg_page(dst),
                                    dst->offset, dst->length, DMA_FROM_DEVICE);
        }
-
-       if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {
-               struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
-
-               crypto4xx_memcpy_from_le32((u32 *)req->iv,
-                       pd_uinfo->sr_va->save_iv,
-                       crypto_skcipher_ivsize(skcipher));
-       }
-
        crypto4xx_ret_sg_desc(dev, pd_uinfo);
        if (ablk_req->base.complete != NULL)
                ablk_req->base.complete(&ablk_req->base, 0);