summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-06 08:14:18 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-06 08:14:18 -0800
commitb881502666783b2d9ca2fc7a056d0f773073a808 (patch)
treeb5ebcd71f8ffdb5f994e39d4808dfee6bb93576e /include
parent910da1a48eeb3be53a8247f6c494aa9d67ab1422 (diff)
parent2f40a178e70030c4712fe63807c883f34c3645eb (diff)
downloadlinux-b881502666783b2d9ca2fc7a056d0f773073a808.tar.gz
linux-b881502666783b2d9ca2fc7a056d0f773073a808.tar.bz2
linux-b881502666783b2d9ca2fc7a056d0f773073a808.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] xcbc: Fix crash with IPsec [CRYPTO] xts: Use proper alignment [CRYPTO] digest: Include internal.h for prototypes [CRYPTO] authenc: Add missing Kconfig dependency on BLKCIPHER [CRYPTO] skcipher: Move chainiv/seqiv into crypto_blkcipher module
Diffstat (limited to 'include')
-rw-r--r--include/crypto/internal/skcipher.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index 2ba42cd7d6aa..a8f12644a13c 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -15,6 +15,7 @@
#include <crypto/algapi.h>
#include <crypto/skcipher.h>
+#include <linux/init.h>
#include <linux/types.h>
struct rtattr;
@@ -64,6 +65,11 @@ void skcipher_geniv_free(struct crypto_instance *inst);
int skcipher_geniv_init(struct crypto_tfm *tfm);
void skcipher_geniv_exit(struct crypto_tfm *tfm);
+int __init eseqiv_module_init(void);
+void __exit eseqiv_module_exit(void);
+int __init chainiv_module_init(void);
+void __exit chainiv_module_exit(void);
+
static inline struct crypto_ablkcipher *skcipher_geniv_cipher(
struct crypto_ablkcipher *geniv)
{