diff options
| author |   David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 23:47:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 23:47:04 -0700 |
| commit | d09f51b6997f3f443c5741bc696651e479576715 (patch) | |
| tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c /include | |
| parent | [IPV4]: Cleanup call to __neigh_lookup() (diff) | |
| parent | [CRYPTO] api: Allow ablkcipher with no queues (diff) | |
| download | linux-dev-d09f51b6997f3f443c5741bc696651e479576715.tar.xz linux-dev-d09f51b6997f3f443c5741bc696651e479576715.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/crypto.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 0de7e2ace822..357e8cfedc37 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -295,28 +295,8 @@ struct blkcipher_tfm { }; struct cipher_tfm { - void *cit_iv; - unsigned int cit_ivsize; - u32 cit_mode; int (*cit_setkey)(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); - int (*cit_encrypt)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes); - int (*cit_encrypt_iv)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv); - int (*cit_decrypt)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes); - int (*cit_decrypt_iv)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv); - void (*cit_xor_block)(u8 *dst, const u8 *src); void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src); void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src); }; |