mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
dfa86b01e5
This patch brings the crypto4xx driver up to the latest upstream changes. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 1ad0f1603a6b2afb62a1c065409aaa4e43ca7627 Mon Sep 17 00:00:00 2001
|
|
From: Eric Biggers <ebiggers@google.com>
|
|
Date: Wed, 14 Nov 2018 12:19:39 -0800
|
|
Subject: [PATCH 03/15] crypto: drop mask=CRYPTO_ALG_ASYNC from 'cipher' tfm
|
|
allocations
|
|
|
|
'cipher' algorithms (single block ciphers) are always synchronous, so
|
|
passing CRYPTO_ALG_ASYNC in the mask to crypto_alloc_cipher() has no
|
|
effect. Many users therefore already don't pass it, but some still do.
|
|
This inconsistency can cause confusion, especially since the way the
|
|
'mask' argument works is somewhat counterintuitive.
|
|
|
|
Thus, just remove the unneeded CRYPTO_ALG_ASYNC flags.
|
|
|
|
This patch shouldn't change any actual behavior.
|
|
|
|
Signed-off-by: Eric Biggers <ebiggers@google.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_alg.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_alg.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_alg.c
|
|
@@ -520,8 +520,7 @@ static int crypto4xx_compute_gcm_hash_ke
|
|
uint8_t src[16] = { 0 };
|
|
int rc = 0;
|
|
|
|
- aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC |
|
|
- CRYPTO_ALG_NEED_FALLBACK);
|
|
+ aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_NEED_FALLBACK);
|
|
if (IS_ERR(aes_tfm)) {
|
|
rc = PTR_ERR(aes_tfm);
|
|
pr_warn("could not load aes cipher driver: %d\n", rc);
|