aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2014-03-04 13:28:39 +0800
committerMark Brown <broonie@linaro.org>2014-06-18 20:21:14 +0100
commit86fac535b5d2c1272b4991fa1e11a7fca7a26d10 (patch)
tree3403a5915d78b82ddbc2eda25380d609b0b7e12e
parent581a6bd433c6ec65fdb5b4667258a8b275ae5c96 (diff)
downloadlinux-86fac535b5d2c1272b4991fa1e11a7fca7a26d10.tar.gz
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: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 4f7f1d7cff8f2c170ce0319eb4c01a82c328d34f) Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--crypto/blkcipher.c14
-rw-r--r--include/crypto/algapi.h4
2 files changed, 18 insertions, 0 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index a79e7e9ab86..c3a9e82eff0 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -358,6 +358,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)
{
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 418d270e180..d61ac19bb5f 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -192,6 +192,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);