Commit e72b48c5 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: geniv - remove unneeded arguments from aead_geniv_alloc() 



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

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d7866e50

crypto/echainiv.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int echainiv_aead_create(struct crypto_template *tmpl, 
	struct aead_instance *inst;

	int err;



	inst = aead_geniv_alloc(tmpl, tb, 0, 0);

	inst = aead_geniv_alloc(tmpl, tb);



	if (IS_ERR(inst))

		return PTR_ERR(inst);

crypto/geniv.c

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void aead_geniv_free(struct aead_instance *inst) 
}



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_attr_type *algt;
@@ -47,6 +47,7 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl, 
	struct aead_alg *alg;

	unsigned int ivsize;

	unsigned int maxauthsize;

	u32 mask;

	int err;



	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);



	/* 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),

			       crypto_attr_alg_name(tb[1]), type, mask);

			       crypto_attr_alg_name(tb[1]), 0, mask);

	if (err)

		goto err_free_inst;

crypto/seqiv.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int seqiv_aead_create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct aead_instance *inst;

	int err;



	inst = aead_geniv_alloc(tmpl, tb, 0, 0);

	inst = aead_geniv_alloc(tmpl, tb);



	if (IS_ERR(inst))

		return PTR_ERR(inst);

include/crypto/internal/geniv.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ struct aead_geniv_ctx { 
};



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);

void aead_exit_geniv(struct crypto_aead *tfm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE