From 5cd72963bebffa0dc6820c98d9a849984fe9eb0a Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Tue, 18 Oct 2011 00:03:13 +0300 Subject: [PATCH] --- yaml --- r: 283266 b: refs/heads/master c: dd6eec242bb2df73743f07535d2bacd6707c6300 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/crypto/Makefile | 4 +++- trunk/crypto/serpent.c | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a7dcdde8669..8fe4032c1c52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc83b8299cb4ac2a9f64215a04854e4c934d1510 +refs/heads/master: dd6eec242bb2df73743f07535d2bacd6707c6300 diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile index 9e6eee2c05db..0e1f2aa7218e 100644 --- a/trunk/crypto/Makefile +++ b/trunk/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/trunk/crypto/serpent.c b/trunk/crypto/serpent.c index 867ca93ebb63..eb6163041b08 100644 --- a/trunk/crypto/serpent.c +++ b/trunk/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 "); MODULE_ALIAS("tnepres"); +MODULE_ALIAS("serpent");