summaryrefslogtreecommitdiff
path: root/crypto/aes_generic.c
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2015-01-11 18:17:42 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-02-20 00:49:36 +0000
commitfd1910098bb42815a475a53b94fdfdfe3aa38002 (patch)
tree7f98ebdb22bf4b56d86a24a6de75f3fae3793e79 /crypto/aes_generic.c
parentbed7f528031d6c800615380990af22cd8b0e3577 (diff)
crypto: add missing crypto module aliases
commit 3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf upstream. Commit 5d26a105b5a7 ("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 5d26a105b5a7 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: 5d26a105b5a7 ("crypto: prefix module autoloading with "crypto-"") Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> [bwh: Backported to 3.2: - Adjust filenames - Drop changes to algorithms and drivers we don't have] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto/aes_generic.c')
-rw-r--r--crypto/aes_generic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c
index 682954783251..bd776beabf70 100644
--- a/crypto/aes_generic.c
+++ b/crypto/aes_generic.c
@@ -1476,3 +1476,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");