Commit 5d26a105 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu

crypto: prefix module autoloading with "crypto-"

This prefixes all crypto module loading with "crypto-" so we never run
the risk of exposing module auto-loading to userspace via a crypto API,
as demonstrated by Mathias Krause:

https://lkml.org/lkml/2013/3/4/70Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5d4a5e77
...@@ -93,6 +93,6 @@ module_exit(aes_fini); ...@@ -93,6 +93,6 @@ module_exit(aes_fini);
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
MODULE_ALIAS("aes-asm"); MODULE_ALIAS_CRYPTO("aes-asm");
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>"); MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
...@@ -171,5 +171,5 @@ module_exit(sha1_mod_fini); ...@@ -171,5 +171,5 @@ module_exit(sha1_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)");
MODULE_ALIAS("sha1"); MODULE_ALIAS_CRYPTO("sha1");
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>"); MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
...@@ -194,4 +194,4 @@ module_exit(sha1_neon_mod_fini); ...@@ -194,4 +194,4 @@ module_exit(sha1_neon_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated");
MODULE_ALIAS("sha1"); MODULE_ALIAS_CRYPTO("sha1");
...@@ -301,5 +301,5 @@ module_exit(sha512_neon_mod_fini); ...@@ -301,5 +301,5 @@ module_exit(sha512_neon_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, NEON accelerated"); MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, NEON accelerated");
MODULE_ALIAS("sha512"); MODULE_ALIAS_CRYPTO("sha512");
MODULE_ALIAS("sha384"); MODULE_ALIAS_CRYPTO("sha384");
...@@ -294,4 +294,4 @@ module_exit(aes_mod_exit); ...@@ -294,4 +294,4 @@ module_exit(aes_mod_exit);
MODULE_DESCRIPTION("Synchronous AES in CCM mode using ARMv8 Crypto Extensions"); MODULE_DESCRIPTION("Synchronous AES in CCM mode using ARMv8 Crypto Extensions");
MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>"); MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("ccm(aes)"); MODULE_ALIAS_CRYPTO("ccm(aes)");
...@@ -38,10 +38,10 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions"); ...@@ -38,10 +38,10 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");
#define aes_xts_encrypt neon_aes_xts_encrypt #define aes_xts_encrypt neon_aes_xts_encrypt
#define aes_xts_decrypt neon_aes_xts_decrypt #define aes_xts_decrypt neon_aes_xts_decrypt
MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON"); MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON");
MODULE_ALIAS("ecb(aes)"); MODULE_ALIAS_CRYPTO("ecb(aes)");
MODULE_ALIAS("cbc(aes)"); MODULE_ALIAS_CRYPTO("cbc(aes)");
MODULE_ALIAS("ctr(aes)"); MODULE_ALIAS_CRYPTO("ctr(aes)");
MODULE_ALIAS("xts(aes)"); MODULE_ALIAS_CRYPTO("xts(aes)");
#endif #endif
MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>"); MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
......
...@@ -154,4 +154,4 @@ module_exit(sha1_powerpc_mod_fini); ...@@ -154,4 +154,4 @@ module_exit(sha1_powerpc_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
MODULE_ALIAS("sha1-powerpc"); MODULE_ALIAS_CRYPTO("sha1-powerpc");
...@@ -979,7 +979,7 @@ static void __exit aes_s390_fini(void) ...@@ -979,7 +979,7 @@ static void __exit aes_s390_fini(void)
module_init(aes_s390_init); module_init(aes_s390_init);
module_exit(aes_s390_fini); module_exit(aes_s390_fini);
MODULE_ALIAS("aes-all"); MODULE_ALIAS_CRYPTO("aes-all");
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -619,8 +619,8 @@ static void __exit des_s390_exit(void) ...@@ -619,8 +619,8 @@ static void __exit des_s390_exit(void)
module_init(des_s390_init); module_init(des_s390_init);
module_exit(des_s390_exit); module_exit(des_s390_exit);
MODULE_ALIAS("des"); MODULE_ALIAS_CRYPTO("des");
MODULE_ALIAS("des3_ede"); MODULE_ALIAS_CRYPTO("des3_ede");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms"); MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
...@@ -160,7 +160,7 @@ static void __exit ghash_mod_exit(void) ...@@ -160,7 +160,7 @@ static void __exit ghash_mod_exit(void)
module_init(ghash_mod_init); module_init(ghash_mod_init);
module_exit(ghash_mod_exit); module_exit(ghash_mod_exit);
MODULE_ALIAS("ghash"); MODULE_ALIAS_CRYPTO("ghash");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("GHASH Message Digest Algorithm, s390 implementation"); MODULE_DESCRIPTION("GHASH Message Digest Algorithm, s390 implementation");
...@@ -103,6 +103,6 @@ static void __exit sha1_s390_fini(void) ...@@ -103,6 +103,6 @@ static void __exit sha1_s390_fini(void)
module_init(sha1_s390_init); module_init(sha1_s390_init);
module_exit(sha1_s390_fini); module_exit(sha1_s390_fini);
MODULE_ALIAS("sha1"); MODULE_ALIAS_CRYPTO("sha1");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
...@@ -143,7 +143,7 @@ static void __exit sha256_s390_fini(void) ...@@ -143,7 +143,7 @@ static void __exit sha256_s390_fini(void)
module_init(sha256_s390_init); module_init(sha256_s390_init);
module_exit(sha256_s390_fini); module_exit(sha256_s390_fini);
MODULE_ALIAS("sha256"); MODULE_ALIAS_CRYPTO("sha256");
MODULE_ALIAS("sha224"); MODULE_ALIAS_CRYPTO("sha224");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm"); MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm");
...@@ -86,7 +86,7 @@ static struct shash_alg sha512_alg = { ...@@ -86,7 +86,7 @@ static struct shash_alg sha512_alg = {
} }
}; };
MODULE_ALIAS("sha512"); MODULE_ALIAS_CRYPTO("sha512");
static int sha384_init(struct shash_desc *desc) static int sha384_init(struct shash_desc *desc)
{ {
...@@ -126,7 +126,7 @@ static struct shash_alg sha384_alg = { ...@@ -126,7 +126,7 @@ static struct shash_alg sha384_alg = {
} }
}; };
MODULE_ALIAS("sha384"); MODULE_ALIAS_CRYPTO("sha384");
static int __init init(void) static int __init init(void)
{ {
......
...@@ -499,6 +499,6 @@ module_exit(aes_sparc64_mod_fini); ...@@ -499,6 +499,6 @@ module_exit(aes_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated"); MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -322,6 +322,6 @@ module_exit(camellia_sparc64_mod_fini); ...@@ -322,6 +322,6 @@ module_exit(camellia_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -176,6 +176,6 @@ module_exit(crc32c_sparc64_mod_fini); ...@@ -176,6 +176,6 @@ module_exit(crc32c_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated"); MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");
MODULE_ALIAS("crc32c"); MODULE_ALIAS_CRYPTO("crc32c");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -532,6 +532,6 @@ module_exit(des_sparc64_mod_fini); ...@@ -532,6 +532,6 @@ module_exit(des_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated"); MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated");
MODULE_ALIAS("des"); MODULE_ALIAS_CRYPTO("des");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -185,6 +185,6 @@ module_exit(md5_sparc64_mod_fini); ...@@ -185,6 +185,6 @@ module_exit(md5_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated"); MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated");
MODULE_ALIAS("md5"); MODULE_ALIAS_CRYPTO("md5");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -180,6 +180,6 @@ module_exit(sha1_sparc64_mod_fini); ...@@ -180,6 +180,6 @@ module_exit(sha1_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");
MODULE_ALIAS("sha1"); MODULE_ALIAS_CRYPTO("sha1");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -237,7 +237,7 @@ module_exit(sha256_sparc64_mod_fini); ...@@ -237,7 +237,7 @@ module_exit(sha256_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 opcode accelerated"); MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 opcode accelerated");
MODULE_ALIAS("sha224"); MODULE_ALIAS_CRYPTO("sha224");
MODULE_ALIAS("sha256"); MODULE_ALIAS_CRYPTO("sha256");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -222,7 +222,7 @@ module_exit(sha512_sparc64_mod_fini); ...@@ -222,7 +222,7 @@ module_exit(sha512_sparc64_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 opcode accelerated"); MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 opcode accelerated");
MODULE_ALIAS("sha384"); MODULE_ALIAS_CRYPTO("sha384");
MODULE_ALIAS("sha512"); MODULE_ALIAS_CRYPTO("sha512");
#include "crop_devid.c" #include "crop_devid.c"
...@@ -66,5 +66,5 @@ module_exit(aes_fini); ...@@ -66,5 +66,5 @@ module_exit(aes_fini);
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
MODULE_ALIAS("aes-asm"); MODULE_ALIAS_CRYPTO("aes-asm");
...@@ -1546,4 +1546,4 @@ module_exit(aesni_exit); ...@@ -1546,4 +1546,4 @@ module_exit(aesni_exit);
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
...@@ -478,5 +478,5 @@ module_exit(fini); ...@@ -478,5 +478,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Blowfish Cipher Algorithm, asm optimized"); MODULE_DESCRIPTION("Blowfish Cipher Algorithm, asm optimized");
MODULE_ALIAS("blowfish"); MODULE_ALIAS_CRYPTO("blowfish");
MODULE_ALIAS("blowfish-asm"); MODULE_ALIAS_CRYPTO("blowfish-asm");
...@@ -582,5 +582,5 @@ module_exit(camellia_aesni_fini); ...@@ -582,5 +582,5 @@ module_exit(camellia_aesni_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX2 optimized"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX2 optimized");
MODULE_ALIAS("camellia"); MODULE_ALIAS_CRYPTO("camellia");
MODULE_ALIAS("camellia-asm"); MODULE_ALIAS_CRYPTO("camellia-asm");
...@@ -574,5 +574,5 @@ module_exit(camellia_aesni_fini); ...@@ -574,5 +574,5 @@ module_exit(camellia_aesni_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized");
MODULE_ALIAS("camellia"); MODULE_ALIAS_CRYPTO("camellia");
MODULE_ALIAS("camellia-asm"); MODULE_ALIAS_CRYPTO("camellia-asm");
...@@ -1725,5 +1725,5 @@ module_exit(fini); ...@@ -1725,5 +1725,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized");
MODULE_ALIAS("camellia"); MODULE_ALIAS_CRYPTO("camellia");
MODULE_ALIAS("camellia-asm"); MODULE_ALIAS_CRYPTO("camellia-asm");
...@@ -491,4 +491,4 @@ module_exit(cast5_exit); ...@@ -491,4 +491,4 @@ module_exit(cast5_exit);
MODULE_DESCRIPTION("Cast5 Cipher Algorithm, AVX optimized"); MODULE_DESCRIPTION("Cast5 Cipher Algorithm, AVX optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("cast5"); MODULE_ALIAS_CRYPTO("cast5");
...@@ -611,4 +611,4 @@ module_exit(cast6_exit); ...@@ -611,4 +611,4 @@ module_exit(cast6_exit);
MODULE_DESCRIPTION("Cast6 Cipher Algorithm, AVX optimized"); MODULE_DESCRIPTION("Cast6 Cipher Algorithm, AVX optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("cast6"); MODULE_ALIAS_CRYPTO("cast6");
...@@ -197,5 +197,5 @@ module_exit(crc32_pclmul_mod_fini); ...@@ -197,5 +197,5 @@ module_exit(crc32_pclmul_mod_fini);
MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>"); MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("crc32"); MODULE_ALIAS_CRYPTO("crc32");
MODULE_ALIAS("crc32-pclmul"); MODULE_ALIAS_CRYPTO("crc32-pclmul");
...@@ -280,5 +280,5 @@ MODULE_AUTHOR("Austin Zhang <austin.zhang@intel.com>, Kent Liu <kent.liu@intel.c ...@@ -280,5 +280,5 @@ MODULE_AUTHOR("Austin Zhang <austin.zhang@intel.com>, Kent Liu <kent.liu@intel.c
MODULE_DESCRIPTION("CRC32c (Castagnoli) optimization using Intel Hardware."); MODULE_DESCRIPTION("CRC32c (Castagnoli) optimization using Intel Hardware.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("crc32c"); MODULE_ALIAS_CRYPTO("crc32c");
MODULE_ALIAS("crc32c-intel"); MODULE_ALIAS_CRYPTO("crc32c-intel");
...@@ -147,5 +147,5 @@ MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>"); ...@@ -147,5 +147,5 @@ MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>");
MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ."); MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("crct10dif"); MODULE_ALIAS_CRYPTO("crct10dif");
MODULE_ALIAS("crct10dif-pclmul"); MODULE_ALIAS_CRYPTO("crct10dif-pclmul");
...@@ -502,8 +502,8 @@ module_exit(des3_ede_x86_fini); ...@@ -502,8 +502,8 @@ module_exit(des3_ede_x86_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Triple DES EDE Cipher Algorithm, asm optimized"); MODULE_DESCRIPTION("Triple DES EDE Cipher Algorithm, asm optimized");
MODULE_ALIAS("des3_ede"); MODULE_ALIAS_CRYPTO("des3_ede");
MODULE_ALIAS("des3_ede-asm"); MODULE_ALIAS_CRYPTO("des3_ede-asm");
MODULE_ALIAS("des"); MODULE_ALIAS_CRYPTO("des");
MODULE_ALIAS("des-asm"); MODULE_ALIAS_CRYPTO("des-asm");
MODULE_AUTHOR("Jussi Kivilinna <jussi.kivilinna@iki.fi>"); MODULE_AUTHOR("Jussi Kivilinna <jussi.kivilinna@iki.fi>");
...@@ -341,4 +341,4 @@ module_exit(ghash_pclmulqdqni_mod_exit); ...@@ -341,4 +341,4 @@ module_exit(ghash_pclmulqdqni_mod_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("GHASH Message Digest Algorithm, " MODULE_DESCRIPTION("GHASH Message Digest Algorithm, "
"acclerated by PCLMULQDQ-NI"); "acclerated by PCLMULQDQ-NI");
MODULE_ALIAS("ghash"); MODULE_ALIAS_CRYPTO("ghash");
...@@ -119,5 +119,5 @@ module_exit(fini); ...@@ -119,5 +119,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm (optimized assembly version)"); MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm (optimized assembly version)");
MODULE_ALIAS("salsa20"); MODULE_ALIAS_CRYPTO("salsa20");
MODULE_ALIAS("salsa20-asm"); MODULE_ALIAS_CRYPTO("salsa20-asm");
...@@ -558,5 +558,5 @@ module_exit(fini); ...@@ -558,5 +558,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX2 optimized"); MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX2 optimized");
MODULE_ALIAS("serpent"); MODULE_ALIAS_CRYPTO("serpent");
MODULE_ALIAS("serpent-asm"); MODULE_ALIAS_CRYPTO("serpent-asm");
...@@ -617,4 +617,4 @@ module_exit(serpent_exit); ...@@ -617,4 +617,4 @@ module_exit(serpent_exit);
MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX optimized"); MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("serpent"); MODULE_ALIAS_CRYPTO("serpent");
...@@ -618,4 +618,4 @@ module_exit(serpent_sse2_exit); ...@@ -618,4 +618,4 @@ module_exit(serpent_sse2_exit);
MODULE_DESCRIPTION("Serpent Cipher Algorithm, SSE2 optimized"); MODULE_DESCRIPTION("Serpent Cipher Algorithm, SSE2 optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("serpent"); MODULE_ALIAS_CRYPTO("serpent");
...@@ -278,4 +278,4 @@ module_exit(sha1_ssse3_mod_fini); ...@@ -278,4 +278,4 @@ module_exit(sha1_ssse3_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, Supplemental SSE3 accelerated"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, Supplemental SSE3 accelerated");
MODULE_ALIAS("sha1"); MODULE_ALIAS_CRYPTO("sha1");
...@@ -318,5 +318,5 @@ module_exit(sha256_ssse3_mod_fini); ...@@ -318,5 +318,5 @@ module_exit(sha256_ssse3_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm, Supplemental SSE3 accelerated"); MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm, Supplemental SSE3 accelerated");
MODULE_ALIAS("sha256"); MODULE_ALIAS_CRYPTO("sha256");
MODULE_ALIAS("sha224"); MODULE_ALIAS_CRYPTO("sha224");
...@@ -326,5 +326,5 @@ module_exit(sha512_ssse3_mod_fini); ...@@ -326,5 +326,5 @@ module_exit(sha512_ssse3_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated"); MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated");
MODULE_ALIAS("sha512"); MODULE_ALIAS_CRYPTO("sha512");
MODULE_ALIAS("sha384"); MODULE_ALIAS_CRYPTO("sha384");
...@@ -579,4 +579,4 @@ module_exit(twofish_exit); ...@@ -579,4 +579,4 @@ module_exit(twofish_exit);
MODULE_DESCRIPTION("Twofish Cipher Algorithm, AVX optimized"); MODULE_DESCRIPTION("Twofish Cipher Algorithm, AVX optimized");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("twofish"); MODULE_ALIAS_CRYPTO("twofish");
...@@ -96,5 +96,5 @@ module_exit(fini); ...@@ -96,5 +96,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized"); MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized");
MODULE_ALIAS("twofish"); MODULE_ALIAS_CRYPTO("twofish");
MODULE_ALIAS("twofish-asm"); MODULE_ALIAS_CRYPTO("twofish-asm");
...@@ -495,5 +495,5 @@ module_exit(fini); ...@@ -495,5 +495,5 @@ module_exit(fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Twofish Cipher Algorithm, 3-way parallel asm optimized"); MODULE_DESCRIPTION("Twofish Cipher Algorithm, 3-way parallel asm optimized");
MODULE_ALIAS("twofish"); MODULE_ALIAS_CRYPTO("twofish");
MODULE_ALIAS("twofish-asm"); MODULE_ALIAS_CRYPTO("twofish-asm");
...@@ -180,3 +180,4 @@ module_exit(nx842_mod_exit); ...@@ -180,3 +180,4 @@ module_exit(nx842_mod_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("842 Compression Algorithm"); MODULE_DESCRIPTION("842 Compression Algorithm");
MODULE_ALIAS_CRYPTO("842");
...@@ -1474,4 +1474,4 @@ module_exit(aes_fini); ...@@ -1474,4 +1474,4 @@ module_exit(aes_fini);
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_ALIAS("aes"); MODULE_ALIAS_CRYPTO("aes");
...@@ -476,4 +476,4 @@ module_param(dbg, int, 0); ...@@ -476,4 +476,4 @@ module_param(dbg, int, 0);
MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)"); MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");
module_init(prng_mod_init); module_init(prng_mod_init);
module_exit(prng_mod_fini); module_exit(prng_mod_fini);
MODULE_ALIAS("stdrng"); MODULE_ALIAS_CRYPTO("stdrng");
...@@ -704,3 +704,4 @@ module_exit(anubis_mod_fini); ...@@ -704,3 +704,4 @@ module_exit(anubis_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Anubis Cryptographic Algorithm"); MODULE_DESCRIPTION("Anubis Cryptographic Algorithm");
MODULE_ALIAS_CRYPTO("anubis");
...@@ -216,11 +216,11 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask) ...@@ -216,11 +216,11 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
alg = crypto_alg_lookup(name, type, mask); alg = crypto_alg_lookup(name, type, mask);
if (!alg) { if (!alg) {
request_module("%s", name); request_module("crypto-%s", name);
if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask & if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
CRYPTO_ALG_NEED_FALLBACK)) CRYPTO_ALG_NEED_FALLBACK))
request_module("%s-all", name); request_module("crypto-%s-all", name);
alg = crypto_alg_lookup(name, type, mask); alg = crypto_alg_lookup(name, type, mask);
} }
......
...@@ -166,3 +166,4 @@ module_exit(arc4_exit); ...@@ -166,3 +166,4 @@ module_exit(arc4_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ARC4 Cipher Algorithm"); MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
MODULE_AUTHOR("Jon Oberheide <jon@oberheide.org>"); MODULE_AUTHOR("Jon Oberheide <jon@oberheide.org>");
MODULE_ALIAS_CRYPTO("arc4");
...@@ -138,4 +138,4 @@ module_exit(blowfish_mod_fini); ...@@ -138,4 +138,4 @@ module_exit(blowfish_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Blowfish Cipher Algorithm"); MODULE_DESCRIPTION("Blowfish Cipher Algorithm");
MODULE_ALIAS("blowfish"); MODULE_ALIAS_CRYPTO("blowfish");
...@@ -1098,4 +1098,4 @@ module_exit(camellia_fini); ...@@ -1098,4 +1098,4 @@ module_exit(camellia_fini);
MODULE_DESCRIPTION("Camellia Cipher Algorithm"); MODULE_DESCRIPTION("Camellia Cipher Algorithm");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("camellia"); MODULE_ALIAS_CRYPTO("camellia");
...@@ -549,4 +549,4 @@ module_exit(cast5_mod_fini); ...@@ -549,4 +549,4 @@ module_exit(cast5_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Cast5 Cipher Algorithm"); MODULE_DESCRIPTION("Cast5 Cipher Algorithm");
MODULE_ALIAS("cast5"); MODULE_ALIAS_CRYPTO("cast5");
...@@ -291,4 +291,4 @@ module_exit(cast6_mod_fini); ...@@ -291,4 +291,4 @@ module_exit(cast6_mod_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");