diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 13:01:53 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 12:59:26 +0200 |
| commit | b765f4be407ca407c8f446a0970aab8e7e93bffb (patch) | |
| tree | c7fa07cd13ad6e5bb380a14a7c7e4e5f49d383b0 /target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch | |
| parent | 456f486b53a7cbe7035dca7323f6b5fdb58be444 (diff) | |
| download | upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.gz upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.bz2 upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.zip | |
kernel: bump 4.14 to 4.14.114
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Remove upstreamed:
- 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/021-0005-crypto-crypto4xx-perform-aead-icv-check-in-the-drive.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 0dbd924e3c..5470602bb1 100644 --- 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 */ |