kernel: bump 4.14 to 4.14.114

[openwrt/staging/981213.git] / target / linux / apm821xx / patches-4.14 / 021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch

diff --git a/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch b/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch
index 0dbd924e3c2826473c8e857e4ad5831704a01bc9..5470602bb1652193ace076a21ff3542c5f02c13f 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch
+++ b/target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch
@@ -40,7 +40,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 
 --- a/drivers/crypto/amcc/crypto4xx_alg.c
 +++ b/drivers/crypto/amcc/crypto4xx_alg.c
-@@ -256,10 +256,6 @@ static inline bool crypto4xx_aead_need_f
+@@ -257,10 +257,6 @@ static inline bool crypto4xx_aead_need_f
        if (is_ccm && !(req->iv[0] == 1 || req->iv[0] == 3))
                return true;
  
@@ -51,7 +51,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        return false;
  }
  
-@@ -330,7 +326,7 @@ int crypto4xx_setkey_aes_ccm(struct cryp
+@@ -331,7 +327,7 @@ int crypto4xx_setkey_aes_ccm(struct cryp
        sa = (struct dynamic_sa_ctl *) ctx->sa_in;
        sa->sa_contents.w = SA_AES_CCM_CONTENTS | (keylen << 2);
  
@@ -62,7 +62,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
                                 SA_CIPHER_ALG_AES,
 --- a/drivers/crypto/amcc/crypto4xx_core.c
 +++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -577,15 +577,14 @@ static void crypto4xx_aead_done(struct c
+@@ -586,15 +586,14 @@ static void crypto4xx_aead_done(struct c
                                struct pd_uinfo *pd_uinfo,
                                struct ce_pd *pd)
  {
@@ -83,7 +83,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        if (pd_uinfo->using_sd) {
                crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo,
                                          pd->pd_ctl_len.bf.pkt_len,
-@@ -597,38 +596,39 @@ static void crypto4xx_aead_done(struct c
+@@ -606,38 +605,39 @@ static void crypto4xx_aead_done(struct c
  
        if (pd_uinfo->sa_va->sa_command_0.bf.dir == DIR_OUTBOUND) {
                /* append icv at the end */