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

Commit ccc17c34 authored by Michal Ludvig's avatar Michal Ludvig Committed by Herbert Xu
Browse files

[CRYPTO] padlock: Update private header file 



PADLOCK_CRA_PRIORITY is shared between padlock-aes and padlock-sha
so it should be in the header.

On the other hand "struct cword" is only used in padlock-aes.c
so it's unnecessary to have it in padlock.h

Signed-off-by: default avatarMichal Ludvig <michal@logix.cz>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent db5e9a42

drivers/crypto/padlock-aes.c

+12 −1
Original line number Diff line number Diff line
@@ -59,6 +59,17 @@ 
#define AES_EXTENDED_KEY_SIZE	64	/* in uint32_t units */

#define AES_EXTENDED_KEY_SIZE_B	(AES_EXTENDED_KEY_SIZE * sizeof(uint32_t))



/* Control word. */

struct cword {

	unsigned int __attribute__ ((__packed__))

		rounds:4,

		algo:3,

		keygen:1,

		interm:1,

		encdec:1,

		ksize:2;

} __attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));



/* Whenever making any changes to the following

 * structure *make sure* you keep E, d_data

 * and cword aligned on 16 Bytes boundaries!!! */
@@ -473,7 +484,7 @@ static unsigned int aes_decrypt_cbc(const struct cipher_desc *desc, u8 *out, 
static struct crypto_alg aes_alg = {

	.cra_name		=	"aes",

	.cra_driver_name	=	"aes-padlock",

	.cra_priority		=	300,

	.cra_priority		=	PADLOCK_CRA_PRIORITY,

	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize		=	AES_BLOCK_SIZE,

	.cra_ctxsize		=	sizeof(struct aes_ctx),

drivers/crypto/padlock.h

+2 −11
Original line number Diff line number Diff line
@@ -15,17 +15,8 @@ 


#define PADLOCK_ALIGNMENT 16



/* Control word. */

struct cword {

	unsigned int __attribute__ ((__packed__))

		rounds:4,

		algo:3,

		keygen:1,

		interm:1,

		encdec:1,

		ksize:2;

} __attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));



#define PFX	"padlock: "



#define PADLOCK_CRA_PRIORITY	300



#endif	/* _CRYPTO_PADLOCK_H */