adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

crypto: aes - Move key_length in struct crypto_aes_ctx to be the last field

Browse source 
The Intel AES-NI AES acceleration instructions need key_enc, key_dec
in struct crypto_aes_ctx to be 16 byte aligned, it make this easier to
move key_length to be the last one.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Huang Ying 2009-01-09 16:49:30 +11:00 committed by Herbert Xu
parent 8eb2dfac41
commit 109568e110
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/crypto/aes-i586-asm_32.S
View file

@ -46,9 +46,9 @@
#define in_blk 16 #define in_blk 16
/* offsets in crypto_tfm structure */ /* offsets in crypto_tfm structure */
#define klen (crypto_tfm_ctx_offset + 0) #define klen (crypto_tfm_ctx_offset + 480)
#define ekey (crypto_tfm_ctx_offset + 4) #define ekey (crypto_tfm_ctx_offset + 0)
#define dkey (crypto_tfm_ctx_offset + 244) #define dkey (crypto_tfm_ctx_offset + 240)
// register mapping for encrypt and decrypt subroutines // register mapping for encrypt and decrypt subroutines

4
arch/x86/crypto/aes-x86_64-asm_64.S
View file

@ -56,13 +56,13 @@
.align 8; \ .align 8; \
FUNC: movq r1,r2; \ FUNC: movq r1,r2; \
movq r3,r4; \ movq r3,r4; \
leaq BASE+KEY+48+4(r8),r9; \ leaq BASE+KEY+48(r8),r9; \
movq r10,r11; \ movq r10,r11; \
movl (r7),r5 ## E; \ movl (r7),r5 ## E; \
movl 4(r7),r1 ## E; \ movl 4(r7),r1 ## E; \
movl 8(r7),r6 ## E; \ movl 8(r7),r6 ## E; \
movl 12(r7),r7 ## E; \ movl 12(r7),r7 ## E; \
movl BASE+0(r8),r10 ## E; \ movl BASE+480(r8),r10 ## E; \
xorl -48(r9),r5 ## E; \ xorl -48(r9),r5 ## E; \
xorl -44(r9),r1 ## E; \ xorl -44(r9),r1 ## E; \
xorl -40(r9),r6 ## E; \ xorl -40(r9),r6 ## E; \

6
include/crypto/aes.h
View file

@ -17,10 +17,14 @@
#define AES_MAX_KEYLENGTH (15 * 16) #define AES_MAX_KEYLENGTH (15 * 16)
#define AES_MAX_KEYLENGTH_U32 (AES_MAX_KEYLENGTH / sizeof(u32)) #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 { struct crypto_aes_ctx {
u32 key_length;
u32 key_enc[AES_MAX_KEYLENGTH_U32]; u32 key_enc[AES_MAX_KEYLENGTH_U32];
u32 key_dec[AES_MAX_KEYLENGTH_U32]; u32 key_dec[AES_MAX_KEYLENGTH_U32];
u32 key_length;
}; };
extern const u32 crypto_ft_tab[4][256]; extern const u32 crypto_ft_tab[4][256];