raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

crypto: engine - Remove CRYPTO_ALG_ENGINE bit

Browse Source 
Remove the private and obsolete CRYPTO_ALG_ENGINE bit which is
conflicting with the new CRYPTO_ALG_DUP_FIRST bit.

Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Fixes: f1440a9046 ("crypto: api - Add support for duplicating algorithms before registration")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2025-04-24 22:42:51 +08:00
parent 3715cb9863
commit aa38d87ec8
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
crypto/crypto_engine.c
View File

@@ -23,9 +23,6 @@
#define CRYPTO_ENGINE_MAX_QLEN 10 #define CRYPTO_ENGINE_MAX_QLEN 10
/* Temporary algorithm flag used to indicate an updated driver. */
#define CRYPTO_ALG_ENGINE 0x200
struct crypto_engine_alg { struct crypto_engine_alg {
struct crypto_alg base; struct crypto_alg base;
struct crypto_engine_op op; struct crypto_engine_op op;
@@ -148,16 +145,9 @@ start_request:
} }
} }
if (async_req->tfm->__crt_alg->cra_flags & CRYPTO_ALG_ENGINE) { alg = container_of(async_req->tfm->__crt_alg,
alg = container_of(async_req->tfm->__crt_alg, struct crypto_engine_alg, base);
struct crypto_engine_alg, base); op = &alg->op;
op = &alg->op;
} else {
dev_err(engine->dev, "failed to do request\n");
ret = -EINVAL;
goto req_err_1;
}
ret = op->do_one_request(engine, async_req); ret = op->do_one_request(engine, async_req);
/* Request unsuccessfully executed by hardware */ /* Request unsuccessfully executed by hardware */
@@ -569,9 +559,6 @@ int crypto_engine_register_aead(struct aead_engine_alg *alg)
{ {
if (!alg->op.do_one_request) if (!alg->op.do_one_request)
return -EINVAL; return -EINVAL;
alg->base.base.cra_flags |= CRYPTO_ALG_ENGINE;
return crypto_register_aead(&alg->base); return crypto_register_aead(&alg->base);
} }
EXPORT_SYMBOL_GPL(crypto_engine_register_aead); EXPORT_SYMBOL_GPL(crypto_engine_register_aead);
@@ -614,9 +601,6 @@ int crypto_engine_register_ahash(struct ahash_engine_alg *alg)
{ {
if (!alg->op.do_one_request) if (!alg->op.do_one_request)
return -EINVAL; return -EINVAL;
alg->base.halg.base.cra_flags |= CRYPTO_ALG_ENGINE;
return crypto_register_ahash(&alg->base); return crypto_register_ahash(&alg->base);
} }
EXPORT_SYMBOL_GPL(crypto_engine_register_ahash); EXPORT_SYMBOL_GPL(crypto_engine_register_ahash);
@@ -660,9 +644,6 @@ int crypto_engine_register_akcipher(struct akcipher_engine_alg *alg)
{ {
if (!alg->op.do_one_request) if (!alg->op.do_one_request)
return -EINVAL; return -EINVAL;
alg->base.base.cra_flags |= CRYPTO_ALG_ENGINE;
return crypto_register_akcipher(&alg->base); return crypto_register_akcipher(&alg->base);
} }
EXPORT_SYMBOL_GPL(crypto_engine_register_akcipher); EXPORT_SYMBOL_GPL(crypto_engine_register_akcipher);
@@ -677,9 +658,6 @@ int crypto_engine_register_kpp(struct kpp_engine_alg *alg)
{ {
if (!alg->op.do_one_request) if (!alg->op.do_one_request)
return -EINVAL; return -EINVAL;
alg->base.base.cra_flags |= CRYPTO_ALG_ENGINE;
return crypto_register_kpp(&alg->base); return crypto_register_kpp(&alg->base);
} }
EXPORT_SYMBOL_GPL(crypto_engine_register_kpp); EXPORT_SYMBOL_GPL(crypto_engine_register_kpp);
@@ -694,9 +672,6 @@ int crypto_engine_register_skcipher(struct skcipher_engine_alg *alg)
{ {
if (!alg->op.do_one_request) if (!alg->op.do_one_request)
return -EINVAL; return -EINVAL;
alg->base.base.cra_flags |= CRYPTO_ALG_ENGINE;
return crypto_register_skcipher(&alg->base); return crypto_register_skcipher(&alg->base);
} }
EXPORT_SYMBOL_GPL(crypto_engine_register_skcipher); EXPORT_SYMBOL_GPL(crypto_engine_register_skcipher);