kernel: bump 4.14 to 4.14.114

[openwrt/staging/dedeckeh.git] / target / linux / apm821xx / patches-4.14 / 022-0005-crypto-crypto4xx-add-aes-ctr-support.patch

diff --git a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch
index e93a3d916b9f5bedef46d3d7de315877cb0aed7c..c916d5a212f625be12c1985664fddfe0d941b0c5 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch
+++ b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch
@@ -39,7 +39,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
 
 --- a/drivers/crypto/amcc/crypto4xx_alg.c
 +++ b/drivers/crypto/amcc/crypto4xx_alg.c
-@@ -240,6 +240,85 @@ int crypto4xx_rfc3686_decrypt(struct skc
+@@ -241,6 +241,85 @@ int crypto4xx_rfc3686_decrypt(struct skc
                                  ctx->sa_out, ctx->sa_len, 0);
  }
  
@@ -125,7 +125,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  static inline bool crypto4xx_aead_need_fallback(struct aead_request *req,
                                                bool is_ccm, bool decrypt)
  {
-@@ -282,10 +361,10 @@ static int crypto4xx_aead_fallback(struc
+@@ -283,10 +362,10 @@ static int crypto4xx_aead_fallback(struc
                            crypto_aead_encrypt(subreq);
  }
  
@@ -140,7 +140,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  {
        int rc;
  
-@@ -313,7 +392,7 @@ int crypto4xx_setkey_aes_ccm(struct cryp
+@@ -314,7 +393,7 @@ int crypto4xx_setkey_aes_ccm(struct cryp
        struct dynamic_sa_ctl *sa;
        int rc = 0;
  
@@ -149,7 +149,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        if (rc)
                return rc;
  
-@@ -472,7 +551,7 @@ int crypto4xx_setkey_aes_gcm(struct cryp
+@@ -473,7 +552,7 @@ int crypto4xx_setkey_aes_gcm(struct cryp
                return -EINVAL;
        }
  
@@ -160,7 +160,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
 --- a/drivers/crypto/amcc/crypto4xx_core.c
 +++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -941,6 +941,19 @@ static int crypto4xx_sk_init(struct cryp
+@@ -950,6 +950,19 @@ static int crypto4xx_sk_init(struct cryp
        struct crypto4xx_alg *amcc_alg;
        struct crypto4xx_ctx *ctx =  crypto_skcipher_ctx(sk);
  
@@ -180,7 +180,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.cipher);
        crypto4xx_ctx_init(amcc_alg, ctx);
        return 0;
-@@ -956,6 +969,8 @@ static void crypto4xx_sk_exit(struct cry
+@@ -965,6 +978,8 @@ static void crypto4xx_sk_exit(struct cry
        struct crypto4xx_ctx *ctx =  crypto_skcipher_ctx(sk);
  
        crypto4xx_common_exit(ctx);
@@ -189,7 +189,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  }
  
  static int crypto4xx_aead_init(struct crypto_aead *tfm)
-@@ -1145,6 +1160,28 @@ static struct crypto4xx_alg_common crypt
+@@ -1154,6 +1169,28 @@ static struct crypto4xx_alg_common crypt
                .init = crypto4xx_sk_init,
                .exit = crypto4xx_sk_exit,
        } },