Commit 5b04fc17 authored Jun 03, 2010 by Joachim Fritschi Committed by Herbert Xu Jun 03, 2010

crypto: twofish: Rename twofish to twofish_generic and add an alias



This fixes the broken autoloading of the corresponding twofish assembler
ciphers on x86 and x86_64 if they are available. The module name of the
generic implementation was in conflict with the alias in the assembler
modules. The generic twofish c implementation is renamed to
twofish_generic according to the other algorithms with assembler
implementations and an module alias is added for 'twofish'. You can now
load 'twofish' giving you the best implementation by priority,
'twofish-generic' to get the c implementation or 'twofish-asm' to get
the assembler version of cipher.

Signed-off-by: Joachim Fritschi <jfritschi@freenet.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 0b767f96

crypto/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
		obj-$(CONFIG_CRYPTO_DES) += des_generic.o
		obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
		obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
		obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
		obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
		obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
		obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
		obj-$(CONFIG_CRYPTO_AES) += aes_generic.o

crypto/twofish.c→crypto/twofish_generic.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -212,3 +212,4 @@ module_exit(twofish_mod_fini);

		MODULE_LICENSE("GPL");
		MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
		MODULE_ALIAS("twofish");