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

Commit 06e1a8f0 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Herbert Xu
Browse files

[CRYPTO] aes-asm: Merge common glue code 



32 bit and 64 bit glue code is using (now) the same
piece code. This patch unifies them.

Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 28db8e3e

arch/x86/crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o 
obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o

obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o



aes-i586-y := aes-i586-asm_32.o aes_32.o

aes-i586-y := aes-i586-asm_32.o aes_glue.o

twofish-i586-y := twofish-i586-asm_32.o twofish_32.o



aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o

aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o

twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o

arch/x86/crypto/aes_32.c

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
/*

 * Glue Code for optimized 586 assembler version of AES

 */



#include <crypto/aes.h>

#include <linux/module.h>

#include <linux/crypto.h>



asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);

asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);



static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)

{

	aes_enc_blk(tfm, dst, src);

}



static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)

{

	aes_dec_blk(tfm, dst, 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 crypto_aes_ctx),

	.cra_module		=	THIS_MODULE,

	.cra_list		=	LIST_HEAD_INIT(aes_alg.cra_list),

	.cra_u			=	{

		.cipher = {

			.cia_min_keysize	=	AES_MIN_KEY_SIZE,

			.cia_max_keysize	=	AES_MAX_KEY_SIZE,

			.cia_setkey		=	crypto_aes_set_key,

			.cia_encrypt	 	=	aes_encrypt,

			.cia_decrypt	  	=	aes_decrypt

		}

	}

};



static int __init aes_init(void)

{

	return crypto_register_alg(&aes_alg);

}



static void __exit aes_fini(void)

{

	crypto_unregister_alg(&aes_alg);

}



module_init(aes_init);

module_exit(aes_fini);



MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, i586 asm optimized");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_AUTHOR("Fruhwirth Clemens, James Morris, Brian Gladman, Adam Richter");

MODULE_ALIAS("aes");

arch/x86/crypto/aes_64.c→arch/x86/crypto/aes_glue.c

+18 −17
Original line number Diff line number Diff line 
/*

 * Glue Code for AES Cipher Algorithm

 * Glue Code for the asm optimized version of the AES Cipher Algorithm

 *

 */
@@ -20,7 +20,7 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 


static struct crypto_alg aes_alg = {

	.cra_name		= "aes",

	.cra_driver_name	=	"aes-x86_64",

	.cra_driver_name	= "aes-asm",

	.cra_priority		= 200,

	.cra_flags		= CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize		= AES_BLOCK_SIZE,
@@ -51,6 +51,7 @@ static void __exit aes_fini(void) 
module_init(aes_init);

module_exit(aes_fini);



MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");

MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized");

MODULE_LICENSE("GPL");

MODULE_ALIAS("aes");

MODULE_ALIAS("aes-asm");