diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-10-18 00:03:13 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-11-09 11:43:00 +0800 |
| commit | dd6eec242bb2df73743f07535d2bacd6707c6300 (patch) | |
| tree | 16ee8e2c2b89d0baffe05c7ea8121d8252f01793 /crypto | |
| parent | bc83b8299cb4ac2a9f64215a04854e4c934d1510 (diff) | |
| download | linux-3.10-dd6eec242bb2df73743f07535d2bacd6707c6300.tar.gz linux-3.10-dd6eec242bb2df73743f07535d2bacd6707c6300.tar.bz2 linux-3.10-dd6eec242bb2df73743f07535d2bacd6707c6300.zip | |
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile | 4 | ||||
| -rw-r--r-- | crypto/serpent.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 9e6eee2c05d..0e1f2aa7218 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -65,7 +65,9 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o -obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o + +serpent_generic-y := serpent.o +obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o obj-$(CONFIG_CRYPTO_AES) += aes_generic.o obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o obj-$(CONFIG_CRYPTO_CAST5) += cast5.o diff --git a/crypto/serpent.c b/crypto/serpent.c index 867ca93ebb6..eb6163041b0 100644 --- a/crypto/serpent.c +++ b/crypto/serpent.c @@ -478,6 +478,8 @@ static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) static struct crypto_alg serpent_alg = { .cra_name = "serpent", + .cra_driver_name = "serpent-generic", + .cra_priority = 100, .cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_blocksize = SERPENT_BLOCK_SIZE, .cra_ctxsize = sizeof(struct serpent_ctx), @@ -588,3 +590,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm"); MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>"); MODULE_ALIAS("tnepres"); +MODULE_ALIAS("serpent"); |