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

crypto: cipher - make crypto_spawn_cipher() take a crypto_cipher_spawn 



Now that all users of single-block cipher spawns have been converted to
use 'struct crypto_cipher_spawn' rather than the less specifically typed
'struct crypto_spawn', make crypto_spawn_cipher() take a pointer to a
'struct crypto_cipher_spawn' rather than a 'struct crypto_spawn'.

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

crypto/adiantum.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static int adiantum_init_tfm(struct crypto_skcipher *tfm) 
	if (IS_ERR(streamcipher))

		return PTR_ERR(streamcipher);



	blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn.base);

	blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn);

	if (IS_ERR(blockcipher)) {

		err = PTR_ERR(blockcipher);

		goto err_free_streamcipher;

crypto/ccm.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static int cbcmac_init_tfm(struct crypto_tfm *tfm) 
{

	struct crypto_cipher *cipher;

	struct crypto_instance *inst = (void *)tfm->__crt_alg;

	struct crypto_spawn *spawn = crypto_instance_ctx(inst);

	struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);

	struct cbcmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);



	cipher = crypto_spawn_cipher(spawn);

crypto/cmac.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int cmac_init_tfm(struct crypto_tfm *tfm) 
{

	struct crypto_cipher *cipher;

	struct crypto_instance *inst = (void *)tfm->__crt_alg;

	struct crypto_spawn *spawn = crypto_instance_ctx(inst);

	struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);

	struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);



	cipher = crypto_spawn_cipher(spawn);

crypto/skcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ static int skcipher_setkey_simple(struct crypto_skcipher *tfm, const u8 *key, 
static int skcipher_init_tfm_simple(struct crypto_skcipher *tfm)

{

	struct skcipher_instance *inst = skcipher_alg_instance(tfm);

	struct crypto_spawn *spawn = skcipher_instance_ctx(inst);

	struct crypto_cipher_spawn *spawn = skcipher_instance_ctx(inst);

	struct skcipher_ctx_simple *ctx = crypto_skcipher_ctx(tfm);

	struct crypto_cipher *cipher;

crypto/vmac.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static int vmac_final(struct shash_desc *desc, u8 *out) 
static int vmac_init_tfm(struct crypto_tfm *tfm)

{

	struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);

	struct crypto_spawn *spawn = crypto_instance_ctx(inst);

	struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);

	struct vmac_tfm_ctx *tctx = crypto_tfm_ctx(tfm);

	struct crypto_cipher *cipher;