lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] padlock: Fix alignment after aes_ctx rearrange
This commit is contained in:
Linus Torvalds
2006-07-14 21:57:45 -07:00
parent 5694ca9f46 cc08632f8f
commit d6c93e1ddd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/crypto/padlock-aes.c
View File

@@ -59,6 +59,9 @@
#define AES_EXTENDED_KEY_SIZE 64 /* in uint32_t units */ #define AES_EXTENDED_KEY_SIZE 64 /* in uint32_t units */
#define AES_EXTENDED_KEY_SIZE_B (AES_EXTENDED_KEY_SIZE * sizeof(uint32_t)) #define AES_EXTENDED_KEY_SIZE_B (AES_EXTENDED_KEY_SIZE * sizeof(uint32_t))
/* Whenever making any changes to the following
* structure *make sure* you keep E, d_data
* and cword aligned on 16 Bytes boundaries!!! */
struct aes_ctx { struct aes_ctx {
struct { struct {
struct cword encrypt; struct cword encrypt;
@@ -66,8 +69,10 @@ struct aes_ctx {
} cword; } cword;
u32 *D; u32 *D;
int key_length; int key_length;
u32 E[AES_EXTENDED_KEY_SIZE]; u32 E[AES_EXTENDED_KEY_SIZE]
u32 d_data[AES_EXTENDED_KEY_SIZE]; __attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
u32 d_data[AES_EXTENDED_KEY_SIZE]
__attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
}; };
/* ====== Key management routines ====== */ /* ====== Key management routines ====== */