public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: ccm - Only access common skcipher fields on spawn

Browse source 
As skcipher spawns may be of the type lskcipher, only the common
fields may be accessed.  This was already the case but use the
correct helpers to make this more obvious.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-10-03 11:43:25 +08:00
parent 24a285cea8
commit 60fa9a39ae
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crypto/ccm.c
View file

@ -447,10 +447,10 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
const char *ctr_name, const char *ctr_name,
const char *mac_name) const char *mac_name)
{ {
struct skcipher_alg_common *ctr;
u32 mask; u32 mask;
struct aead_instance *inst; struct aead_instance *inst;
struct ccm_instance_ctx *ictx; struct ccm_instance_ctx *ictx;
struct skcipher_alg *ctr;
struct hash_alg_common *mac; struct hash_alg_common *mac;
int err; int err;
@ -478,13 +478,12 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
ctr_name, 0, mask); ctr_name, 0, mask);
if (err) if (err)
goto err_free_inst; goto err_free_inst;
ctr = crypto_spawn_skcipher_alg(&ictx->ctr); ctr = crypto_spawn_skcipher_alg_common(&ictx->ctr);
/* The skcipher algorithm must be CTR mode, using 16-byte blocks. */ /* The skcipher algorithm must be CTR mode, using 16-byte blocks. */
err = -EINVAL; err = -EINVAL;
if (strncmp(ctr->base.cra_name, "ctr(", 4) != 0 || if (strncmp(ctr->base.cra_name, "ctr(", 4) != 0 ||
crypto_skcipher_alg_ivsize(ctr) != 16 || ctr->ivsize != 16 || ctr->base.cra_blocksize != 1)
ctr->base.cra_blocksize != 1)
goto err_free_inst; goto err_free_inst;
/* ctr and cbcmac must use the same underlying block cipher. */ /* ctr and cbcmac must use the same underlying block cipher. */
@ -507,7 +506,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
inst->alg.base.cra_alignmask = mac->base.cra_alignmask | inst->alg.base.cra_alignmask = mac->base.cra_alignmask |
ctr->base.cra_alignmask; ctr->base.cra_alignmask;
inst->alg.ivsize = 16; inst->alg.ivsize = 16;
inst->alg.chunksize = crypto_skcipher_alg_chunksize(ctr); inst->alg.chunksize = ctr->chunksize;
inst->alg.maxauthsize = 16; inst->alg.maxauthsize = 16;
inst->alg.base.cra_ctxsize = sizeof(struct crypto_ccm_ctx); inst->alg.base.cra_ctxsize = sizeof(struct crypto_ccm_ctx);
inst->alg.init = crypto_ccm_init_tfm; inst->alg.init = crypto_ccm_init_tfm;