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

Commit c8a19c91 authored Nov 05, 2005 by Herbert Xu Committed by David S. Miller Jan 09, 2006

[CRYPTO] Allow AES C/ASM implementations to coexist



As the Crypto API now allows multiple implementations to be registered
for the same algorithm, we no longer have to play tricks with Kconfig
to select the right AES implementation.

This patch sets the driver name and priority for all the AES
implementations and removes the Kconfig conditions on the C implementation
for AES.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 5cb1454b

arch/i386/crypto/aes.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,8 @@ static inline void aes_decrypt(void ctx, u8 dst, const u8 *src)

		static struct crypto_alg aes_alg = {
		.cra_name = "aes",
		.cra_driver_name = "aes-i586",
		.cra_priority = 200,
		.cra_flags = CRYPTO_ALG_TYPE_CIPHER,
		.cra_blocksize = AES_BLOCK_SIZE,
		.cra_ctxsize = sizeof(struct aes_ctx),

arch/x86_64/crypto/aes.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,8 @@ extern void aes_decrypt(void ctx_arg, u8 out, const u8 *in);

		static struct crypto_alg aes_alg = {
		.cra_name = "aes",
		.cra_driver_name = "aes-x86_64",
		.cra_priority = 200,
		.cra_flags = CRYPTO_ALG_TYPE_CIPHER,
		.cra_blocksize = AES_BLOCK_SIZE,
		.cra_ctxsize = sizeof(struct aes_ctx),

crypto/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ config CRYPTO_SERPENT

		config CRYPTO_AES
		tristate "AES cipher algorithms"
		depends on CRYPTO && !(X86 \|\| UML_X86)
		depends on CRYPTO
		help
		AES cipher algorithms (FIPS-197). AES uses the Rijndael
		algorithm.

crypto/aes.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,8 @@ static void aes_decrypt(void ctx_arg, u8 out, const u8 *in)

		static struct crypto_alg aes_alg = {
		.cra_name = "aes",
		.cra_driver_name = "aes-generic",
		.cra_priority = 100,
		.cra_flags = CRYPTO_ALG_TYPE_CIPHER,
		.cra_blocksize = AES_BLOCK_SIZE,
		.cra_ctxsize = sizeof(struct aes_ctx),

drivers/crypto/padlock-aes.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,8 @@ 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_flags = CRYPTO_ALG_TYPE_CIPHER,
		.cra_blocksize = AES_BLOCK_SIZE,
		.cra_ctxsize = sizeof(struct aes_ctx),