Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[mv-sheeva.git] / include / crypto / aes.h

diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 9ff842fc6b899cb3834623f8ebc1b6f351e15b10..d480b76715a86fe9f5846d912e549dfc3d057d58 100644 (file)
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -5,6 +5,9 @@
 #ifndef _CRYPTO_AES_H
 #define _CRYPTO_AES_H
 
+#include <linux/types.h>
+#include <linux/crypto.h>
+
 #define AES_MIN_KEY_SIZE       16
 #define AES_MAX_KEY_SIZE       32
 #define AES_KEYSIZE_128                16
@@ -12,4 +15,17 @@
 #define AES_KEYSIZE_256                32
 #define AES_BLOCK_SIZE         16
 
+struct crypto_aes_ctx {
+       u32 key_length;
+       u32 key_enc[60];
+       u32 key_dec[60];
+};
+
+extern u32 crypto_ft_tab[4][256];
+extern u32 crypto_fl_tab[4][256];
+extern u32 crypto_it_tab[4][256];
+extern u32 crypto_il_tab[4][256];
+
+int crypto_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+               unsigned int key_len);
 #endif