Commit b3c16bfc authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: skcipher - Add skcipher_ialg_simple helper 



This patch introduces the skcipher_ialg_simple helper which fetches
the crypto_alg structure from a simple skcipher instance's spawn.

This allows us to remove the third argument from the function
skcipher_alloc_instance_simple.

In doing so the reference count to the algorithm is now maintained
by the Crypto API and the caller no longer needs to drop the alg
refcount.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 93e23eb2

crypto/cbc.c

+7 −8
Original line number Diff line number Diff line
@@ -54,10 +54,12 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct crypto_alg *alg;

	int err;



	inst = skcipher_alloc_instance_simple(tmpl, tb, &alg);

	inst = skcipher_alloc_instance_simple(tmpl, tb);

	if (IS_ERR(inst))

		return PTR_ERR(inst);



	alg = skcipher_ialg_simple(inst);



	err = -EINVAL;

	if (!is_power_of_2(alg->cra_blocksize))

		goto out_free_inst;
@@ -66,14 +68,11 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.decrypt = crypto_cbc_decrypt;



	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto out_free_inst;

	goto out_put_alg;



	if (err) {

out_free_inst:

		inst->free(inst);

out_put_alg:

	crypto_mod_put(alg);

	}



	return err;

}

crypto/cfb.c

+3 −2
Original line number Diff line number Diff line
@@ -203,10 +203,12 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct crypto_alg *alg;

	int err;



	inst = skcipher_alloc_instance_simple(tmpl, tb, &alg);

	inst = skcipher_alloc_instance_simple(tmpl, tb);

	if (IS_ERR(inst))

		return PTR_ERR(inst);



	alg = skcipher_ialg_simple(inst);



	/* CFB mode is a stream cipher. */

	inst->alg.base.cra_blocksize = 1;
@@ -223,7 +225,6 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb) 
	if (err)

		inst->free(inst);



	crypto_mod_put(alg);

	return err;

}

crypto/ctr.c

+7 −8
Original line number Diff line number Diff line
@@ -129,10 +129,12 @@ static int crypto_ctr_create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct crypto_alg *alg;

	int err;



	inst = skcipher_alloc_instance_simple(tmpl, tb, &alg);

	inst = skcipher_alloc_instance_simple(tmpl, tb);

	if (IS_ERR(inst))

		return PTR_ERR(inst);



	alg = skcipher_ialg_simple(inst);



	/* Block size must be >= 4 bytes. */

	err = -EINVAL;

	if (alg->cra_blocksize < 4)
@@ -155,14 +157,11 @@ static int crypto_ctr_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.decrypt = crypto_ctr_crypt;



	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto out_free_inst;

	goto out_put_alg;



	if (err) {

out_free_inst:

		inst->free(inst);

out_put_alg:

	crypto_mod_put(alg);

	}



	return err;

}

crypto/ecb.c

+2 −3
Original line number Diff line number Diff line
@@ -61,10 +61,9 @@ static int crypto_ecb_decrypt(struct skcipher_request *req) 
static int crypto_ecb_create(struct crypto_template *tmpl, struct rtattr **tb)

{

	struct skcipher_instance *inst;

	struct crypto_alg *alg;

	int err;



	inst = skcipher_alloc_instance_simple(tmpl, tb, &alg);

	inst = skcipher_alloc_instance_simple(tmpl, tb);

	if (IS_ERR(inst))

		return PTR_ERR(inst);
@@ -76,7 +75,7 @@ static int crypto_ecb_create(struct crypto_template *tmpl, struct rtattr **tb) 
	err = skcipher_register_instance(tmpl, inst);

	if (err)

		inst->free(inst);

	crypto_mod_put(alg);



	return err;

}

crypto/keywrap.c

+7 −8
Original line number Diff line number Diff line
@@ -266,10 +266,12 @@ static int crypto_kw_create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct crypto_alg *alg;

	int err;



	inst = skcipher_alloc_instance_simple(tmpl, tb, &alg);

	inst = skcipher_alloc_instance_simple(tmpl, tb);

	if (IS_ERR(inst))

		return PTR_ERR(inst);



	alg = skcipher_ialg_simple(inst);



	err = -EINVAL;

	/* Section 5.1 requirement for KW */

	if (alg->cra_blocksize != sizeof(struct crypto_kw_block))
@@ -283,14 +285,11 @@ static int crypto_kw_create(struct crypto_template *tmpl, struct rtattr **tb) 
	inst->alg.decrypt = crypto_kw_decrypt;



	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto out_free_inst;

	goto out_put_alg;



	if (err) {

out_free_inst:

		inst->free(inst);

out_put_alg:

	crypto_mod_put(alg);

	}



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE