summaryrefslogtreecommitdiffstats
path: root/crypto/Makefile
diff options
context:
space:
mode:
authorJoachim Fritschi <jfritschi@freenet.de>2010-06-03 21:02:51 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2010-06-03 21:02:51 +1000
commit5b04fc170382195d7d33fd08e3ccc2ad8e50e782 (patch)
tree47530362afd11dd2637ad5c00e70472fe09e4284 /crypto/Makefile
parent0b767f96164b2b27488e3daa722ff16e89d49314 (diff)
downloadlinux-stable-5b04fc170382195d7d33fd08e3ccc2ad8e50e782.tar.gz
linux-stable-5b04fc170382195d7d33fd08e3ccc2ad8e50e782.tar.bz2
linux-stable-5b04fc170382195d7d33fd08e3ccc2ad8e50e782.zip
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>
Diffstat (limited to 'crypto/Makefile')
-rw-r--r--crypto/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index d1cfa051afe4..423b7de61f93 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -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