target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch

   1 From 8d9f1b2c4ad8b86c4a5af5e4787ea4eae7853f6d Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Thu, 20 Jun 2019 11:29:15 +0200
   4 Subject: Revert "crypto: crypto4xx - properly set IV after de- and encrypt"
   5
   6 This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584.
   7
   8 This fixes a compile problem in upstream kernel 4.4.
   9 ---
  10  drivers/crypto/amcc/crypto4xx_alg.c  | 3 +--
  11  drivers/crypto/amcc/crypto4xx_core.c | 9 ---------
  12  2 files changed, 1 insertion(+), 11 deletions(-)
  13
  14 --- a/drivers/crypto/amcc/crypto4xx_alg.c
  15 +++ b/drivers/crypto/amcc/crypto4xx_alg.c
  16 @@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct c
  17         sa = (struct dynamic_sa_ctl *) ctx->sa_in;
  18         ctx->hash_final = 0;
  19
  20 -       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
  21 -                                SA_SAVE_IV : SA_NOT_SAVE_IV),
  22 +       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
  23                                  SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
  24                                  SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,
  25                                  SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,
  26 --- a/drivers/crypto/amcc/crypto4xx_core.c
  27 +++ b/drivers/crypto/amcc/crypto4xx_core.c
  28 @@ -646,15 +646,6 @@ static u32 crypto4xx_ablkcipher_done(str
  29                 addr = dma_map_page(dev->core_dev->device, sg_page(dst),
  30                                     dst->offset, dst->length, DMA_FROM_DEVICE);
  31         }
  32 -
  33 -       if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {
  34 -               struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
  35 -
  36 -               crypto4xx_memcpy_from_le32((u32 *)req->iv,
  37 -                       pd_uinfo->sr_va->save_iv,
  38 -                       crypto_skcipher_ivsize(skcipher));
  39 -       }
  40 -
  41         crypto4xx_ret_sg_desc(dev, pd_uinfo);
  42         if (ablk_req->base.complete != NULL)
  43                 ablk_req->base.complete(&ablk_req->base, 0);