summaryrefslogtreecommitdiffstats
path: root/include/crypto/aes.h
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
committerFelix Blyakher <felixb@sgi.com>2009-03-31 05:08:33 +0200
commit930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch)
treedf6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /include/crypto/aes.h
parentxfs: increase the maximum number of supported ACL entries (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.tar.xz
linux-930861c4e6f13ce2e7d06cd1ef11441a065517d9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/crypto/aes.h')
-rw-r--r--include/crypto/aes.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 656a4c66a568..7524ba3b6f3c 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -17,10 +17,14 @@
#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 const u32 crypto_ft_tab[4][256];