Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: geniv - remove unneeded arguments from aead_geniv_alloc()

Browse Source 
The type and mask arguments to aead_geniv_alloc() are always 0, so
remove them.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2020-07-09 23:20:36 -07:00 committed by Herbert Xu
parent d7866e503b
commit e72b48c5e7
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/echainiv.c
View File

@ -115,7 +115,7 @@ static int echainiv_aead_create(struct crypto_template *tmpl,
struct aead_instance *inst; struct aead_instance *inst;
int err; int err;
inst = aead_geniv_alloc(tmpl, tb, 0, 0); inst = aead_geniv_alloc(tmpl, tb);
if (IS_ERR(inst)) if (IS_ERR(inst))
return PTR_ERR(inst); return PTR_ERR(inst);

7
crypto/geniv.c
View File

@ -39,7 +39,7 @@ static void aead_geniv_free(struct aead_instance *inst)
} }
struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl, struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
struct rtattr **tb, u32 type, u32 mask) struct rtattr **tb)
{ {
struct crypto_aead_spawn *spawn; struct crypto_aead_spawn *spawn;
struct crypto_attr_type *algt; struct crypto_attr_type *algt;
@ -47,6 +47,7 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
struct aead_alg *alg; struct aead_alg *alg;
unsigned int ivsize; unsigned int ivsize;
unsigned int maxauthsize; unsigned int maxauthsize;
u32 mask;
int err; int err;
algt = crypto_get_attr_type(tb); algt = crypto_get_attr_type(tb);
@ -63,10 +64,10 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
spawn = aead_instance_ctx(inst); spawn = aead_instance_ctx(inst);
/* Ignore async algorithms if necessary. */ /* Ignore async algorithms if necessary. */
mask |= crypto_requires_sync(algt->type, algt->mask); mask = crypto_requires_sync(algt->type, algt->mask);
err = crypto_grab_aead(spawn, aead_crypto_instance(inst), err = crypto_grab_aead(spawn, aead_crypto_instance(inst),
crypto_attr_alg_name(tb[1]), type, mask); crypto_attr_alg_name(tb[1]), 0, mask);
if (err) if (err)
goto err_free_inst; goto err_free_inst;

2
crypto/seqiv.c
View File

@ -138,7 +138,7 @@ static int seqiv_aead_create(struct crypto_template *tmpl, struct rtattr **tb)
struct aead_instance *inst; struct aead_instance *inst;
int err; int err;
inst = aead_geniv_alloc(tmpl, tb, 0, 0); inst = aead_geniv_alloc(tmpl, tb);
if (IS_ERR(inst)) if (IS_ERR(inst))
return PTR_ERR(inst); return PTR_ERR(inst);

2
include/crypto/internal/geniv.h
View File

@ -20,7 +20,7 @@ struct aead_geniv_ctx {
}; };
struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl, struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
struct rtattr **tb, u32 type, u32 mask); struct rtattr **tb);
int aead_init_geniv(struct crypto_aead *tfm); int aead_init_geniv(struct crypto_aead *tfm);
void aead_exit_geniv(struct crypto_aead *tfm); void aead_exit_geniv(struct crypto_aead *tfm);