Merge branch 'for-linus' into for-linus-3.12

[firefly-linux-kernel-4.4.55.git] / include / crypto / aes.h

diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 40008d67ee3daf26573ad8648b491365134aa4d6..7524ba3b6f3c8f2c028215e926afd960297a3728 100644 (file)
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -17,16 +17,20 @@
 #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_length;
        u32 key_enc[AES_MAX_KEYLENGTH_U32];
        u32 key_dec[AES_MAX_KEYLENGTH_U32];
+       u32 key_length;
 };
 
-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);