diff options
| author | Joachim Fritschi <jfritschi@freenet.de> | 2010-06-03 21:02:51 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-03 21:02:51 +1000 |
| commit | 5b04fc170382195d7d33fd08e3ccc2ad8e50e782 (patch) | |
| tree | 47530362afd11dd2637ad5c00e70472fe09e4284 /crypto | |
| parent | 0b767f96164b2b27488e3daa722ff16e89d49314 (diff) | |
| download | blackbird-op-linux-5b04fc170382195d7d33fd08e3ccc2ad8e50e782.tar.gz blackbird-op-linux-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')
| -rw-r--r-- | crypto/Makefile | 2 | ||||
| -rw-r--r-- | crypto/twofish_generic.c (renamed from crypto/twofish.c) | 1 |
2 files changed, 2 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 diff --git a/crypto/twofish.c b/crypto/twofish_generic.c index dfcda231f87a..1f07b843e07c 100644 --- a/crypto/twofish.c +++ b/crypto/twofish_generic.c @@ -212,3 +212,4 @@ module_exit(twofish_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION ("Twofish Cipher Algorithm"); +MODULE_ALIAS("twofish"); |
