Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f7f1d7c authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: allow blkcipher walks over AEAD data 



This adds the function blkcipher_aead_walk_virt_block, which allows the caller
to use the blkcipher walk API to handle the input and output scatterlists.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 822be00f

crypto/blkcipher.c

+14 −0
Original line number Diff line number Diff line
@@ -357,6 +357,20 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc, 
}

EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);



int blkcipher_aead_walk_virt_block(struct blkcipher_desc *desc,

				   struct blkcipher_walk *walk,

				   struct crypto_aead *tfm,

				   unsigned int blocksize)

{

	walk->flags &= ~BLKCIPHER_WALK_PHYS;

	walk->walk_blocksize = blocksize;

	walk->cipher_blocksize = crypto_aead_blocksize(tfm);

	walk->ivsize = crypto_aead_ivsize(tfm);

	walk->alignmask = crypto_aead_alignmask(tfm);

	return blkcipher_walk_first(desc, walk);

}

EXPORT_SYMBOL_GPL(blkcipher_aead_walk_virt_block);



static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,

			    unsigned int keylen)

{

include/crypto/algapi.h

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ int blkcipher_walk_phys(struct blkcipher_desc *desc, 
int blkcipher_walk_virt_block(struct blkcipher_desc *desc,

			      struct blkcipher_walk *walk,

			      unsigned int blocksize);

int blkcipher_aead_walk_virt_block(struct blkcipher_desc *desc,

				   struct blkcipher_walk *walk,

				   struct crypto_aead *tfm,

				   unsigned int blocksize);



int ablkcipher_walk_done(struct ablkcipher_request *req,

			 struct ablkcipher_walk *walk, int err);