diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-22 23:57:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-22 23:57:05 +0100 |
| commit | f396deae7a8c6cc72fffdf2623bd14cc8fc44b4b (patch) | |
| tree | e7ed81d964af65006220bc5fd59c108fd63a6558 /include | |
| parent | 5a8b64f9a2c153e1e05c5b52cd84ba707c0c51cd (diff) | |
| parent | 6ccec6dc2003dd0bf35b0816db98024d69763596 (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-crypto' into linux-linaro-lsk-v3.14
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/algapi.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index e73c19e90e38..016c2f110f63 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h @@ -100,9 +100,12 @@ struct blkcipher_walk { void *page; u8 *buffer; u8 *iv; + unsigned int ivsize; int flags; - unsigned int blocksize; + unsigned int walk_blocksize; + unsigned int cipher_blocksize; + unsigned int alignmask; }; struct ablkcipher_walk { @@ -192,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); |