Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[deliverable/linux.git] / include / crypto / aes.h

diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index d480b76715a86fe9f5846d912e549dfc3d057d58..7524ba3b6f3c8f2c028215e926afd960297a3728 100644 (file)
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -14,18 +14,26 @@
 #define AES_KEYSIZE_192                24
 #define AES_KEYSIZE_256                32
 #define AES_BLOCK_SIZE         16
+#define AES_MAX_KEYLENGTH      (15 * 16)
+#define AES_MAX_KEYLENGTH_U32  (AES_MAX_KEYLENGTH / sizeof(u32))
 
+/*
+ * Please ensure that the first two fields are 16-byte aligned
+ * relative to the start of the structure, i.e., don't move them!
+ */
 struct crypto_aes_ctx {
+       u32 key_enc[AES_MAX_KEYLENGTH_U32];
+       u32 key_dec[AES_MAX_KEYLENGTH_U32];
        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];
+extern const u32 crypto_ft_tab[4][256];
+extern const u32 crypto_fl_tab[4][256];
+extern const u32 crypto_it_tab[4][256];
+extern const u32 crypto_il_tab[4][256];
 
 int crypto_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
                unsigned int key_len);
+int crypto_aes_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,
+               unsigned int key_len);
 #endif