diff options
| author | Eric Biggers <ebiggers@kernel.org> | 2026-10-02 14:50:19 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2026-10-08 18:48:07 +1100 |
| commit | 656cf38b96b659dcc937e6a82ce209d3ed0641f6 (patch) | |
| tree | 4c79953d5f25542dc9e0227758cdc5548a367ccb | |
| parent | 2fbde5f4981be8bf0db5b565a1c67515af65bc50 (diff) | |
crypto: sa2ul - Remove unused fields
Remove the shash, authkey, and auth fields from sa_tfm_ctx since they
have no purpose and create confusion with fields that actually matter.
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | drivers/crypto/sa2ul.c | 9 | ||||
| -rw-r--r-- | drivers/crypto/sa2ul.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/crypto/sa2ul.c b/drivers/crypto/sa2ul.c index b014350a3da0..4557eae94164 100644 --- a/drivers/crypto/sa2ul.c +++ b/drivers/crypto/sa2ul.c @@ -1388,7 +1388,6 @@ static int sa_sha_run(struct ahash_request *req) static int sa_sha_setup(struct sa_tfm_ctx *ctx, struct algo_data *ad) { - int bs = crypto_shash_blocksize(ctx->shash); int cmdl_len; struct sa_cmdl_cfg cfg; @@ -1396,7 +1395,6 @@ static int sa_sha_setup(struct sa_tfm_ctx *ctx, struct algo_data *ad) ad->auth_eng.eng_id = SA_ENG_ID_AM1; ad->auth_eng.sc_size = SA_CTX_AUTH_TYPE2_SZ; - memset(ctx->authkey, 0, bs); memset(&cfg, 0, sizeof(cfg)); cfg.aalg = ad->aalg_id; cfg.enc_eng_id = ad->enc_eng.eng_id; @@ -1439,12 +1437,6 @@ static int sa_sha_cra_init_alg(struct crypto_tfm *tfm, const char *alg_base) return ret; if (alg_base) { - ctx->shash = crypto_alloc_shash(alg_base, 0, 0); - if (IS_ERR(ctx->shash)) { - dev_err(sa_k3_dev, "base driver %s couldn't be loaded\n", - alg_base); - return PTR_ERR(ctx->shash); - } /* for fallback */ ctx->fallback.ahash = crypto_alloc_ahash(alg_base, 0, CRYPTO_ALG_ASYNC); @@ -1599,7 +1591,6 @@ static void sa_sha_cra_exit(struct crypto_tfm *tfm) if (crypto_tfm_alg_type(tfm) == CRYPTO_ALG_TYPE_AHASH) sa_free_ctx_info(&ctx->enc, data); - crypto_free_shash(ctx->shash); crypto_free_ahash(ctx->fallback.ahash); } diff --git a/drivers/crypto/sa2ul.h b/drivers/crypto/sa2ul.h index 12c17a68d350..211ef4e40f22 100644 --- a/drivers/crypto/sa2ul.h +++ b/drivers/crypto/sa2ul.h @@ -307,12 +307,9 @@ struct sa_tfm_ctx { struct sa_crypto_data *dev_data; struct sa_ctx_info enc; struct sa_ctx_info dec; - struct sa_ctx_info auth; int keylen; int iv_idx; u32 key[AES_KEYSIZE_256 / sizeof(u32)]; - u8 authkey[SHA512_BLOCK_SIZE]; - struct crypto_shash *shash; /* for fallback */ union { struct crypto_skcipher *skcipher; |