Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109568e1 authored by Huang Ying's avatar Huang Ying Committed by Herbert Xu
Browse files

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



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: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8eb2dfac

arch/x86/crypto/aes-i586-asm_32.S

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
#define in_blk 16



/* offsets in crypto_tfm structure */

#define klen (crypto_tfm_ctx_offset + 0)

#define ekey (crypto_tfm_ctx_offset + 4)

#define dkey (crypto_tfm_ctx_offset + 244)

#define klen (crypto_tfm_ctx_offset + 480)

#define ekey (crypto_tfm_ctx_offset + 0)

#define dkey (crypto_tfm_ctx_offset + 240)



// register mapping for encrypt and decrypt subroutines

arch/x86/crypto/aes-x86_64-asm_64.S

+2 −2
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ 
	.align	8;			\

FUNC:	movq	r1,r2;			\

	movq	r3,r4;			\

	leaq	BASE+KEY+48+4(r8),r9;	\

	leaq	BASE+KEY+48(r8),r9;	\

	movq	r10,r11;		\

	movl	(r7),r5 ## E;		\

	movl	4(r7),r1 ## E;		\

	movl	8(r7),r6 ## E;		\

	movl	12(r7),r7 ## E;		\

	movl	BASE+0(r8),r10 ## E;	\

	movl	BASE+480(r8),r10 ## E;	\

	xorl	-48(r9),r5 ## E;	\

	xorl	-44(r9),r1 ## E;	\

	xorl	-40(r9),r6 ## E;	\

include/crypto/aes.h

+5 −1
Original line number Diff line number Diff line
@@ -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];