Skip to content

Commit 5d26a10

Browse files
keesherbertx
authored andcommitted
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/70 Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 5d4a5e7 commit 5d26a10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+155
-123
lines changed

Diff for: arch/arm/crypto/aes_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ module_exit(aes_fini);
9393

9494
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");
9595
MODULE_LICENSE("GPL");
96-
MODULE_ALIAS("aes");
97-
MODULE_ALIAS("aes-asm");
96+
MODULE_ALIAS_CRYPTO("aes");
97+
MODULE_ALIAS_CRYPTO("aes-asm");
9898
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");

Diff for: arch/arm/crypto/sha1_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,5 +171,5 @@ module_exit(sha1_mod_fini);
171171

172172
MODULE_LICENSE("GPL");
173173
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)");
174-
MODULE_ALIAS("sha1");
174+
MODULE_ALIAS_CRYPTO("sha1");
175175
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");

Diff for: arch/arm/crypto/sha1_neon_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,4 @@ module_exit(sha1_neon_mod_fini);
194194

195195
MODULE_LICENSE("GPL");
196196
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated");
197-
MODULE_ALIAS("sha1");
197+
MODULE_ALIAS_CRYPTO("sha1");

Diff for: arch/arm/crypto/sha512_neon_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -301,5 +301,5 @@ module_exit(sha512_neon_mod_fini);
301301
MODULE_LICENSE("GPL");
302302
MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, NEON accelerated");
303303

304-
MODULE_ALIAS("sha512");
305-
MODULE_ALIAS("sha384");
304+
MODULE_ALIAS_CRYPTO("sha512");
305+
MODULE_ALIAS_CRYPTO("sha384");

Diff for: arch/arm64/crypto/aes-ce-ccm-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,4 @@ module_exit(aes_mod_exit);
294294
MODULE_DESCRIPTION("Synchronous AES in CCM mode using ARMv8 Crypto Extensions");
295295
MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
296296
MODULE_LICENSE("GPL v2");
297-
MODULE_ALIAS("ccm(aes)");
297+
MODULE_ALIAS_CRYPTO("ccm(aes)");

Diff for: arch/arm64/crypto/aes-glue.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");
3838
#define aes_xts_encrypt neon_aes_xts_encrypt
3939
#define aes_xts_decrypt neon_aes_xts_decrypt
4040
MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON");
41-
MODULE_ALIAS("ecb(aes)");
42-
MODULE_ALIAS("cbc(aes)");
43-
MODULE_ALIAS("ctr(aes)");
44-
MODULE_ALIAS("xts(aes)");
41+
MODULE_ALIAS_CRYPTO("ecb(aes)");
42+
MODULE_ALIAS_CRYPTO("cbc(aes)");
43+
MODULE_ALIAS_CRYPTO("ctr(aes)");
44+
MODULE_ALIAS_CRYPTO("xts(aes)");
4545
#endif
4646

4747
MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");

Diff for: arch/powerpc/crypto/sha1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ module_exit(sha1_powerpc_mod_fini);
154154
MODULE_LICENSE("GPL");
155155
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
156156

157-
MODULE_ALIAS("sha1-powerpc");
157+
MODULE_ALIAS_CRYPTO("sha1-powerpc");

Diff for: arch/s390/crypto/aes_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ static void __exit aes_s390_fini(void)
979979
module_init(aes_s390_init);
980980
module_exit(aes_s390_fini);
981981

982-
MODULE_ALIAS("aes-all");
982+
MODULE_ALIAS_CRYPTO("aes-all");
983983

984984
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
985985
MODULE_LICENSE("GPL");

Diff for: arch/s390/crypto/des_s390.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,8 @@ static void __exit des_s390_exit(void)
619619
module_init(des_s390_init);
620620
module_exit(des_s390_exit);
621621

622-
MODULE_ALIAS("des");
623-
MODULE_ALIAS("des3_ede");
622+
MODULE_ALIAS_CRYPTO("des");
623+
MODULE_ALIAS_CRYPTO("des3_ede");
624624

625625
MODULE_LICENSE("GPL");
626626
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");

Diff for: arch/s390/crypto/ghash_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static void __exit ghash_mod_exit(void)
160160
module_init(ghash_mod_init);
161161
module_exit(ghash_mod_exit);
162162

163-
MODULE_ALIAS("ghash");
163+
MODULE_ALIAS_CRYPTO("ghash");
164164

165165
MODULE_LICENSE("GPL");
166166
MODULE_DESCRIPTION("GHASH Message Digest Algorithm, s390 implementation");

Diff for: arch/s390/crypto/sha1_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ static void __exit sha1_s390_fini(void)
103103
module_init(sha1_s390_init);
104104
module_exit(sha1_s390_fini);
105105

106-
MODULE_ALIAS("sha1");
106+
MODULE_ALIAS_CRYPTO("sha1");
107107
MODULE_LICENSE("GPL");
108108
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");

Diff for: arch/s390/crypto/sha256_s390.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void __exit sha256_s390_fini(void)
143143
module_init(sha256_s390_init);
144144
module_exit(sha256_s390_fini);
145145

146-
MODULE_ALIAS("sha256");
147-
MODULE_ALIAS("sha224");
146+
MODULE_ALIAS_CRYPTO("sha256");
147+
MODULE_ALIAS_CRYPTO("sha224");
148148
MODULE_LICENSE("GPL");
149149
MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm");

Diff for: arch/s390/crypto/sha512_s390.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static struct shash_alg sha512_alg = {
8686
}
8787
};
8888

89-
MODULE_ALIAS("sha512");
89+
MODULE_ALIAS_CRYPTO("sha512");
9090

9191
static int sha384_init(struct shash_desc *desc)
9292
{
@@ -126,7 +126,7 @@ static struct shash_alg sha384_alg = {
126126
}
127127
};
128128

129-
MODULE_ALIAS("sha384");
129+
MODULE_ALIAS_CRYPTO("sha384");
130130

131131
static int __init init(void)
132132
{

Diff for: arch/sparc/crypto/aes_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,6 @@ module_exit(aes_sparc64_mod_fini);
499499
MODULE_LICENSE("GPL");
500500
MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");
501501

502-
MODULE_ALIAS("aes");
502+
MODULE_ALIAS_CRYPTO("aes");
503503

504504
#include "crop_devid.c"

Diff for: arch/sparc/crypto/camellia_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,6 @@ module_exit(camellia_sparc64_mod_fini);
322322
MODULE_LICENSE("GPL");
323323
MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");
324324

325-
MODULE_ALIAS("aes");
325+
MODULE_ALIAS_CRYPTO("aes");
326326

327327
#include "crop_devid.c"

Diff for: arch/sparc/crypto/crc32c_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,6 @@ module_exit(crc32c_sparc64_mod_fini);
176176
MODULE_LICENSE("GPL");
177177
MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");
178178

179-
MODULE_ALIAS("crc32c");
179+
MODULE_ALIAS_CRYPTO("crc32c");
180180

181181
#include "crop_devid.c"

Diff for: arch/sparc/crypto/des_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,6 @@ module_exit(des_sparc64_mod_fini);
532532
MODULE_LICENSE("GPL");
533533
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated");
534534

535-
MODULE_ALIAS("des");
535+
MODULE_ALIAS_CRYPTO("des");
536536

537537
#include "crop_devid.c"

Diff for: arch/sparc/crypto/md5_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,6 @@ module_exit(md5_sparc64_mod_fini);
185185
MODULE_LICENSE("GPL");
186186
MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated");
187187

188-
MODULE_ALIAS("md5");
188+
MODULE_ALIAS_CRYPTO("md5");
189189

190190
#include "crop_devid.c"

Diff for: arch/sparc/crypto/sha1_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,6 @@ module_exit(sha1_sparc64_mod_fini);
180180
MODULE_LICENSE("GPL");
181181
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");
182182

183-
MODULE_ALIAS("sha1");
183+
MODULE_ALIAS_CRYPTO("sha1");
184184

185185
#include "crop_devid.c"

Diff for: arch/sparc/crypto/sha256_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ module_exit(sha256_sparc64_mod_fini);
237237
MODULE_LICENSE("GPL");
238238
MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 opcode accelerated");
239239

240-
MODULE_ALIAS("sha224");
241-
MODULE_ALIAS("sha256");
240+
MODULE_ALIAS_CRYPTO("sha224");
241+
MODULE_ALIAS_CRYPTO("sha256");
242242

243243
#include "crop_devid.c"

Diff for: arch/sparc/crypto/sha512_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ module_exit(sha512_sparc64_mod_fini);
222222
MODULE_LICENSE("GPL");
223223
MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 opcode accelerated");
224224

225-
MODULE_ALIAS("sha384");
226-
MODULE_ALIAS("sha512");
225+
MODULE_ALIAS_CRYPTO("sha384");
226+
MODULE_ALIAS_CRYPTO("sha512");
227227

228228
#include "crop_devid.c"

Diff for: arch/x86/crypto/aes_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ module_exit(aes_fini);
6666

6767
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized");
6868
MODULE_LICENSE("GPL");
69-
MODULE_ALIAS("aes");
70-
MODULE_ALIAS("aes-asm");
69+
MODULE_ALIAS_CRYPTO("aes");
70+
MODULE_ALIAS_CRYPTO("aes-asm");

Diff for: arch/x86/crypto/aesni-intel_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1546,4 +1546,4 @@ module_exit(aesni_exit);
15461546

15471547
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");
15481548
MODULE_LICENSE("GPL");
1549-
MODULE_ALIAS("aes");
1549+
MODULE_ALIAS_CRYPTO("aes");

Diff for: arch/x86/crypto/blowfish_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -478,5 +478,5 @@ module_exit(fini);
478478

479479
MODULE_LICENSE("GPL");
480480
MODULE_DESCRIPTION("Blowfish Cipher Algorithm, asm optimized");
481-
MODULE_ALIAS("blowfish");
482-
MODULE_ALIAS("blowfish-asm");
481+
MODULE_ALIAS_CRYPTO("blowfish");
482+
MODULE_ALIAS_CRYPTO("blowfish-asm");

Diff for: arch/x86/crypto/camellia_aesni_avx2_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -582,5 +582,5 @@ module_exit(camellia_aesni_fini);
582582

583583
MODULE_LICENSE("GPL");
584584
MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX2 optimized");
585-
MODULE_ALIAS("camellia");
586-
MODULE_ALIAS("camellia-asm");
585+
MODULE_ALIAS_CRYPTO("camellia");
586+
MODULE_ALIAS_CRYPTO("camellia-asm");

Diff for: arch/x86/crypto/camellia_aesni_avx_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -574,5 +574,5 @@ module_exit(camellia_aesni_fini);
574574

575575
MODULE_LICENSE("GPL");
576576
MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized");
577-
MODULE_ALIAS("camellia");
578-
MODULE_ALIAS("camellia-asm");
577+
MODULE_ALIAS_CRYPTO("camellia");
578+
MODULE_ALIAS_CRYPTO("camellia-asm");

Diff for: arch/x86/crypto/camellia_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1725,5 +1725,5 @@ module_exit(fini);
17251725

17261726
MODULE_LICENSE("GPL");
17271727
MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized");
1728-
MODULE_ALIAS("camellia");
1729-
MODULE_ALIAS("camellia-asm");
1728+
MODULE_ALIAS_CRYPTO("camellia");
1729+
MODULE_ALIAS_CRYPTO("camellia-asm");

Diff for: arch/x86/crypto/cast5_avx_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,4 +491,4 @@ module_exit(cast5_exit);
491491

492492
MODULE_DESCRIPTION("Cast5 Cipher Algorithm, AVX optimized");
493493
MODULE_LICENSE("GPL");
494-
MODULE_ALIAS("cast5");
494+
MODULE_ALIAS_CRYPTO("cast5");

Diff for: arch/x86/crypto/cast6_avx_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -611,4 +611,4 @@ module_exit(cast6_exit);
611611

612612
MODULE_DESCRIPTION("Cast6 Cipher Algorithm, AVX optimized");
613613
MODULE_LICENSE("GPL");
614-
MODULE_ALIAS("cast6");
614+
MODULE_ALIAS_CRYPTO("cast6");

Diff for: arch/x86/crypto/crc32-pclmul_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,5 @@ module_exit(crc32_pclmul_mod_fini);
197197
MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");
198198
MODULE_LICENSE("GPL");
199199

200-
MODULE_ALIAS("crc32");
201-
MODULE_ALIAS("crc32-pclmul");
200+
MODULE_ALIAS_CRYPTO("crc32");
201+
MODULE_ALIAS_CRYPTO("crc32-pclmul");

Diff for: arch/x86/crypto/crc32c-intel_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,5 +280,5 @@ MODULE_AUTHOR("Austin Zhang <austin.zhang@intel.com>, Kent Liu <kent.liu@intel.c
280280
MODULE_DESCRIPTION("CRC32c (Castagnoli) optimization using Intel Hardware.");
281281
MODULE_LICENSE("GPL");
282282

283-
MODULE_ALIAS("crc32c");
284-
MODULE_ALIAS("crc32c-intel");
283+
MODULE_ALIAS_CRYPTO("crc32c");
284+
MODULE_ALIAS_CRYPTO("crc32c-intel");

Diff for: arch/x86/crypto/crct10dif-pclmul_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>");
147147
MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ.");
148148
MODULE_LICENSE("GPL");
149149

150-
MODULE_ALIAS("crct10dif");
151-
MODULE_ALIAS("crct10dif-pclmul");
150+
MODULE_ALIAS_CRYPTO("crct10dif");
151+
MODULE_ALIAS_CRYPTO("crct10dif-pclmul");

Diff for: arch/x86/crypto/des3_ede_glue.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,8 @@ module_exit(des3_ede_x86_fini);
502502

503503
MODULE_LICENSE("GPL");
504504
MODULE_DESCRIPTION("Triple DES EDE Cipher Algorithm, asm optimized");
505-
MODULE_ALIAS("des3_ede");
506-
MODULE_ALIAS("des3_ede-asm");
507-
MODULE_ALIAS("des");
508-
MODULE_ALIAS("des-asm");
505+
MODULE_ALIAS_CRYPTO("des3_ede");
506+
MODULE_ALIAS_CRYPTO("des3_ede-asm");
507+
MODULE_ALIAS_CRYPTO("des");
508+
MODULE_ALIAS_CRYPTO("des-asm");
509509
MODULE_AUTHOR("Jussi Kivilinna <jussi.kivilinna@iki.fi>");

Diff for: arch/x86/crypto/ghash-clmulni-intel_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,4 @@ module_exit(ghash_pclmulqdqni_mod_exit);
341341
MODULE_LICENSE("GPL");
342342
MODULE_DESCRIPTION("GHASH Message Digest Algorithm, "
343343
"acclerated by PCLMULQDQ-NI");
344-
MODULE_ALIAS("ghash");
344+
MODULE_ALIAS_CRYPTO("ghash");

Diff for: arch/x86/crypto/salsa20_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,5 @@ module_exit(fini);
119119

120120
MODULE_LICENSE("GPL");
121121
MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm (optimized assembly version)");
122-
MODULE_ALIAS("salsa20");
123-
MODULE_ALIAS("salsa20-asm");
122+
MODULE_ALIAS_CRYPTO("salsa20");
123+
MODULE_ALIAS_CRYPTO("salsa20-asm");

Diff for: arch/x86/crypto/serpent_avx2_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -558,5 +558,5 @@ module_exit(fini);
558558

559559
MODULE_LICENSE("GPL");
560560
MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX2 optimized");
561-
MODULE_ALIAS("serpent");
562-
MODULE_ALIAS("serpent-asm");
561+
MODULE_ALIAS_CRYPTO("serpent");
562+
MODULE_ALIAS_CRYPTO("serpent-asm");

Diff for: arch/x86/crypto/serpent_avx_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -617,4 +617,4 @@ module_exit(serpent_exit);
617617

618618
MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX optimized");
619619
MODULE_LICENSE("GPL");
620-
MODULE_ALIAS("serpent");
620+
MODULE_ALIAS_CRYPTO("serpent");

Diff for: arch/x86/crypto/serpent_sse2_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -618,4 +618,4 @@ module_exit(serpent_sse2_exit);
618618

619619
MODULE_DESCRIPTION("Serpent Cipher Algorithm, SSE2 optimized");
620620
MODULE_LICENSE("GPL");
621-
MODULE_ALIAS("serpent");
621+
MODULE_ALIAS_CRYPTO("serpent");

Diff for: arch/x86/crypto/sha1_ssse3_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,4 +278,4 @@ module_exit(sha1_ssse3_mod_fini);
278278
MODULE_LICENSE("GPL");
279279
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, Supplemental SSE3 accelerated");
280280

281-
MODULE_ALIAS("sha1");
281+
MODULE_ALIAS_CRYPTO("sha1");

Diff for: arch/x86/crypto/sha256_ssse3_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,5 +318,5 @@ module_exit(sha256_ssse3_mod_fini);
318318
MODULE_LICENSE("GPL");
319319
MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm, Supplemental SSE3 accelerated");
320320

321-
MODULE_ALIAS("sha256");
322-
MODULE_ALIAS("sha224");
321+
MODULE_ALIAS_CRYPTO("sha256");
322+
MODULE_ALIAS_CRYPTO("sha224");

Diff for: arch/x86/crypto/sha512_ssse3_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -326,5 +326,5 @@ module_exit(sha512_ssse3_mod_fini);
326326
MODULE_LICENSE("GPL");
327327
MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated");
328328

329-
MODULE_ALIAS("sha512");
330-
MODULE_ALIAS("sha384");
329+
MODULE_ALIAS_CRYPTO("sha512");
330+
MODULE_ALIAS_CRYPTO("sha384");

Diff for: arch/x86/crypto/twofish_avx_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -579,4 +579,4 @@ module_exit(twofish_exit);
579579

580580
MODULE_DESCRIPTION("Twofish Cipher Algorithm, AVX optimized");
581581
MODULE_LICENSE("GPL");
582-
MODULE_ALIAS("twofish");
582+
MODULE_ALIAS_CRYPTO("twofish");

Diff for: arch/x86/crypto/twofish_glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ module_exit(fini);
9696

9797
MODULE_LICENSE("GPL");
9898
MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized");
99-
MODULE_ALIAS("twofish");
100-
MODULE_ALIAS("twofish-asm");
99+
MODULE_ALIAS_CRYPTO("twofish");
100+
MODULE_ALIAS_CRYPTO("twofish-asm");

Diff for: arch/x86/crypto/twofish_glue_3way.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -495,5 +495,5 @@ module_exit(fini);
495495

496496
MODULE_LICENSE("GPL");
497497
MODULE_DESCRIPTION("Twofish Cipher Algorithm, 3-way parallel asm optimized");
498-
MODULE_ALIAS("twofish");
499-
MODULE_ALIAS("twofish-asm");
498+
MODULE_ALIAS_CRYPTO("twofish");
499+
MODULE_ALIAS_CRYPTO("twofish-asm");

Diff for: crypto/842.c

+1
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,4 @@ module_exit(nx842_mod_exit);
180180

181181
MODULE_LICENSE("GPL");
182182
MODULE_DESCRIPTION("842 Compression Algorithm");
183+
MODULE_ALIAS_CRYPTO("842");

Diff for: crypto/aes_generic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1474,4 +1474,4 @@ module_exit(aes_fini);
14741474

14751475
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
14761476
MODULE_LICENSE("Dual BSD/GPL");
1477-
MODULE_ALIAS("aes");
1477+
MODULE_ALIAS_CRYPTO("aes");

Diff for: crypto/ansi_cprng.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -476,4 +476,4 @@ module_param(dbg, int, 0);
476476
MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");
477477
module_init(prng_mod_init);
478478
module_exit(prng_mod_fini);
479-
MODULE_ALIAS("stdrng");
479+
MODULE_ALIAS_CRYPTO("stdrng");

Diff for: crypto/anubis.c

+1
Original file line numberDiff line numberDiff line change
@@ -704,3 +704,4 @@ module_exit(anubis_mod_fini);
704704

705705
MODULE_LICENSE("GPL");
706706
MODULE_DESCRIPTION("Anubis Cryptographic Algorithm");
707+
MODULE_ALIAS_CRYPTO("anubis");

Diff for: crypto/api.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
216216

217217
alg = crypto_alg_lookup(name, type, mask);
218218
if (!alg) {
219-
request_module("%s", name);
219+
request_module("crypto-%s", name);
220220

221221
if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
222222
CRYPTO_ALG_NEED_FALLBACK))
223-
request_module("%s-all", name);
223+
request_module("crypto-%s-all", name);
224224

225225
alg = crypto_alg_lookup(name, type, mask);
226226
}

0 commit comments

Comments
 (0)