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

Commit dd6eec24 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: serpent - rename module from serpent to serpent_generic 



Rename module from serpent.ko to serpent_generic.ko and add module alias. This
is to allow assembler implementation to autoload on 'modprobe serpent'. Also
add driver_name and priority for serpent cipher.

CC: Dag Arne Osvik <osvik@ii.uib.no>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bc83b829

crypto/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o 
obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o

obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o

obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o

obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o



serpent_generic-y := serpent.o

obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o

obj-$(CONFIG_CRYPTO_AES) += aes_generic.o

obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o

obj-$(CONFIG_CRYPTO_CAST5) += cast5.o

crypto/serpent.c

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 


static struct crypto_alg serpent_alg = {

	.cra_name		=	"serpent",

	.cra_driver_name	=	"serpent-generic",

	.cra_priority		=	100,

	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize		=	SERPENT_BLOCK_SIZE,

	.cra_ctxsize		=	sizeof(struct serpent_ctx),
@@ -588,3 +590,4 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm");

MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>");

MODULE_ALIAS("tnepres");

MODULE_ALIAS("serpent");