Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e14dcf7 authored by Mathias Krause's avatar Mathias Krause Committed by Herbert Xu
Browse files

crypto: add missing crypto module aliases 



Commit 5d26a105 ("crypto: prefix module autoloading with "crypto-"")
changed the automatic module loading when requesting crypto algorithms
to prefix all module requests with "crypto-". This requires all crypto
modules to have a crypto specific module alias even if their file name
would otherwise match the requested crypto algorithm.

Even though commit 5d26a105 added those aliases for a vast amount of
modules, it was missing a few. Add the required MODULE_ALIAS_CRYPTO
annotations to those files to make them get loaded automatically, again.
This fixes, e.g., requesting 'ecb(blowfish-generic)', which used to work
with kernels v3.18 and below.

Also change MODULE_ALIAS() lines to MODULE_ALIAS_CRYPTO(). The former
won't work for crypto modules any more.

Fixes: 5d26a105 ("crypto: prefix module autoloading with "crypto-"")
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0b8c960c

arch/powerpc/crypto/sha1.c

+1 −0
Original line number Diff line number Diff line
@@ -154,4 +154,5 @@ module_exit(sha1_powerpc_mod_fini); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");



MODULE_ALIAS_CRYPTO("sha1");

MODULE_ALIAS_CRYPTO("sha1-powerpc");

arch/x86/crypto/sha-mb/sha1_mb.c

+1 −1
Original line number Diff line number Diff line
@@ -931,4 +931,4 @@ module_exit(sha1_mb_mod_fini); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, multi buffer accelerated");



MODULE_ALIAS("sha1");
 
MODULE_ALIAS_CRYPTO("sha1");

crypto/aes_generic.c

+1 −0
Original line number Diff line number Diff line
@@ -1475,3 +1475,4 @@ module_exit(aes_fini); 
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_ALIAS_CRYPTO("aes");

MODULE_ALIAS_CRYPTO("aes-generic");

crypto/ansi_cprng.c

+1 −0
Original line number Diff line number Diff line
@@ -477,3 +477,4 @@ MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)"); 
module_init(prng_mod_init);

module_exit(prng_mod_fini);

MODULE_ALIAS_CRYPTO("stdrng");

MODULE_ALIAS_CRYPTO("ansi_cprng");

crypto/blowfish_generic.c

+1 −0
Original line number Diff line number Diff line
@@ -139,3 +139,4 @@ module_exit(blowfish_mod_fini); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Blowfish Cipher Algorithm");

MODULE_ALIAS_CRYPTO("blowfish");

MODULE_ALIAS_CRYPTO("blowfish-generic");