Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jussi Kivilinna and committed by
Herbert Xu
dd6eec24 bc83b829

+6 -1
+3 -1
crypto/Makefile
··· 65 65 obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o 66 66 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o 67 67 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o 68 - obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o 68 + 69 + serpent_generic-y := serpent.o 70 + obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o 69 71 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o 70 72 obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o 71 73 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
+3
crypto/serpent.c
··· 478 478 479 479 static struct crypto_alg serpent_alg = { 480 480 .cra_name = "serpent", 481 + .cra_driver_name = "serpent-generic", 482 + .cra_priority = 100, 481 483 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 482 484 .cra_blocksize = SERPENT_BLOCK_SIZE, 483 485 .cra_ctxsize = sizeof(struct serpent_ctx), ··· 590 588 MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm"); 591 589 MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>"); 592 590 MODULE_ALIAS("tnepres"); 591 + MODULE_ALIAS("serpent");