Skip to contentSkip to conversation

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

PATCH RESEND In review Joachim Fritschi 2 participants 2 messages May 26, 2010 – Jun 3, 2010 Crypto API

lore
Share & tools
lore

Joachim Fritschi

author
#0 lore raw

PATCH RESEND 1/1 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 [email protected]
---
 crypto/Makefile                         |    2 +-
 crypto/{twofish.c => twofish_generic.c} |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
 rename crypto/{twofish.c => twofish_generic.c} (99%)
crypto/Makefile +1 -1
index d7e6441..d719716 100644
@@ -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_generic.c renamed from crypto/twofish.c +1 -0
similarity index 99%
rename from crypto/twofish.c
rename to crypto/twofish_generic.c
index dfcda23..1f07b84 100644
@@ -212,3 +212,4 @@ module_exit(twofish_mod_fini);
  MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
+MODULE_ALIAS("twofish");
Signature · 1 line
1.6.4.4
maintainer
#1 lore raw
Quoted 11 lines · Joachim Fritschi

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 [email protected]

I had to fix up your patch by hand becaus it was white space damaged. Also you should put angle brackets around your email address on the sign-off line.

Anyway I've applied your patch. Thanks.

Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt