patches/bugfix: axe merged crypto patches
Signed-off-by: maximilian attems <maks@debian.org> svn path=/dists/trunk/linux/; revision=22314
This commit is contained in:
parent
c5c9b67ca6
commit
ccf5d0a2e1
|
@ -1,276 +0,0 @@
|
|||
From: Mathias Krause <minipli@googlemail.com>
|
||||
Date: Sun, 11 Jan 2015 18:17:42 +0100
|
||||
Subject: crypto: add missing crypto module aliases
|
||||
Origin: https://git.kernel.org/linus/3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf
|
||||
|
||||
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>
|
||||
---
|
||||
arch/powerpc/crypto/sha1.c | 1 +
|
||||
arch/x86/crypto/sha-mb/sha1_mb.c | 2 +-
|
||||
crypto/aes_generic.c | 1 +
|
||||
crypto/ansi_cprng.c | 1 +
|
||||
crypto/blowfish_generic.c | 1 +
|
||||
crypto/camellia_generic.c | 1 +
|
||||
crypto/cast5_generic.c | 1 +
|
||||
crypto/cast6_generic.c | 1 +
|
||||
crypto/crc32c_generic.c | 1 +
|
||||
crypto/crct10dif_generic.c | 1 +
|
||||
crypto/des_generic.c | 7 ++++---
|
||||
crypto/ghash-generic.c | 1 +
|
||||
crypto/krng.c | 1 +
|
||||
crypto/salsa20_generic.c | 1 +
|
||||
crypto/serpent_generic.c | 1 +
|
||||
crypto/sha1_generic.c | 1 +
|
||||
crypto/sha256_generic.c | 2 ++
|
||||
crypto/sha512_generic.c | 2 ++
|
||||
crypto/tea.c | 1 +
|
||||
crypto/tgr192.c | 1 +
|
||||
crypto/twofish_generic.c | 1 +
|
||||
crypto/wp512.c | 1 +
|
||||
22 files changed, 27 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
|
||||
index d3feba5a2..c154ceb 100644
|
||||
--- a/arch/powerpc/crypto/sha1.c
|
||||
+++ b/arch/powerpc/crypto/sha1.c
|
||||
@@ -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");
|
||||
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c
|
||||
index a225a5ca..fd9f6b0 100644
|
||||
--- a/arch/x86/crypto/sha-mb/sha1_mb.c
|
||||
+++ b/arch/x86/crypto/sha-mb/sha1_mb.c
|
||||
@@ -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");
|
||||
diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c
|
||||
index 9b3c54c..3dd1011 100644
|
||||
--- a/crypto/aes_generic.c
|
||||
+++ b/crypto/aes_generic.c
|
||||
@@ -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");
|
||||
diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
|
||||
index b4485a1..6f5bebc 100644
|
||||
--- a/crypto/ansi_cprng.c
|
||||
+++ b/crypto/ansi_cprng.c
|
||||
@@ -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");
|
||||
diff --git a/crypto/blowfish_generic.c b/crypto/blowfish_generic.c
|
||||
index 7bd71f0..87b392a 100644
|
||||
--- a/crypto/blowfish_generic.c
|
||||
+++ b/crypto/blowfish_generic.c
|
||||
@@ -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");
|
||||
diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c
|
||||
index 1b74c5a..a02286b 100644
|
||||
--- a/crypto/camellia_generic.c
|
||||
+++ b/crypto/camellia_generic.c
|
||||
@@ -1099,3 +1099,4 @@ module_exit(camellia_fini);
|
||||
MODULE_DESCRIPTION("Camellia Cipher Algorithm");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS_CRYPTO("camellia");
|
||||
+MODULE_ALIAS_CRYPTO("camellia-generic");
|
||||
diff --git a/crypto/cast5_generic.c b/crypto/cast5_generic.c
|
||||
index 84c86db..df5c726 100644
|
||||
--- a/crypto/cast5_generic.c
|
||||
+++ b/crypto/cast5_generic.c
|
||||
@@ -550,3 +550,4 @@ module_exit(cast5_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Cast5 Cipher Algorithm");
|
||||
MODULE_ALIAS_CRYPTO("cast5");
|
||||
+MODULE_ALIAS_CRYPTO("cast5-generic");
|
||||
diff --git a/crypto/cast6_generic.c b/crypto/cast6_generic.c
|
||||
index f408f0b..058c8d7 100644
|
||||
--- a/crypto/cast6_generic.c
|
||||
+++ b/crypto/cast6_generic.c
|
||||
@@ -292,3 +292,4 @@ module_exit(cast6_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Cast6 Cipher Algorithm");
|
||||
MODULE_ALIAS_CRYPTO("cast6");
|
||||
+MODULE_ALIAS_CRYPTO("cast6-generic");
|
||||
diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c
|
||||
index 2a06202..06f1b60 100644
|
||||
--- a/crypto/crc32c_generic.c
|
||||
+++ b/crypto/crc32c_generic.c
|
||||
@@ -171,4 +171,5 @@ MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
|
||||
MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS_CRYPTO("crc32c");
|
||||
+MODULE_ALIAS_CRYPTO("crc32c-generic");
|
||||
MODULE_SOFTDEP("pre: crc32c");
|
||||
diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c
|
||||
index 08bb4f5..c1229614 100644
|
||||
--- a/crypto/crct10dif_generic.c
|
||||
+++ b/crypto/crct10dif_generic.c
|
||||
@@ -125,3 +125,4 @@ MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>");
|
||||
MODULE_DESCRIPTION("T10 DIF CRC calculation.");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS_CRYPTO("crct10dif");
|
||||
+MODULE_ALIAS_CRYPTO("crct10dif-generic");
|
||||
diff --git a/crypto/des_generic.c b/crypto/des_generic.c
|
||||
index 4291294..a717205 100644
|
||||
--- a/crypto/des_generic.c
|
||||
+++ b/crypto/des_generic.c
|
||||
@@ -983,8 +983,6 @@ static struct crypto_alg des_algs[2] = { {
|
||||
.cia_decrypt = des3_ede_decrypt } }
|
||||
} };
|
||||
|
||||
-MODULE_ALIAS_CRYPTO("des3_ede");
|
||||
-
|
||||
static int __init des_generic_mod_init(void)
|
||||
{
|
||||
return crypto_register_algs(des_algs, ARRAY_SIZE(des_algs));
|
||||
@@ -1001,4 +999,7 @@ module_exit(des_generic_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
|
||||
MODULE_AUTHOR("Dag Arne Osvik <da@osvik.no>");
|
||||
-MODULE_ALIAS("des");
|
||||
+MODULE_ALIAS_CRYPTO("des");
|
||||
+MODULE_ALIAS_CRYPTO("des-generic");
|
||||
+MODULE_ALIAS_CRYPTO("des3_ede");
|
||||
+MODULE_ALIAS_CRYPTO("des3_ede-generic");
|
||||
diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
|
||||
index 4e97fae..bac7099 100644
|
||||
--- a/crypto/ghash-generic.c
|
||||
+++ b/crypto/ghash-generic.c
|
||||
@@ -173,3 +173,4 @@ module_exit(ghash_mod_exit);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("GHASH Message Digest Algorithm");
|
||||
MODULE_ALIAS_CRYPTO("ghash");
|
||||
+MODULE_ALIAS_CRYPTO("ghash-generic");
|
||||
diff --git a/crypto/krng.c b/crypto/krng.c
|
||||
index 67c88b3..0224841 100644
|
||||
--- a/crypto/krng.c
|
||||
+++ b/crypto/krng.c
|
||||
@@ -63,3 +63,4 @@ module_exit(krng_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Kernel Random Number Generator");
|
||||
MODULE_ALIAS_CRYPTO("stdrng");
|
||||
+MODULE_ALIAS_CRYPTO("krng");
|
||||
diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c
|
||||
index 3d0f9df..f550b5d 100644
|
||||
--- a/crypto/salsa20_generic.c
|
||||
+++ b/crypto/salsa20_generic.c
|
||||
@@ -249,3 +249,4 @@ module_exit(salsa20_generic_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm");
|
||||
MODULE_ALIAS_CRYPTO("salsa20");
|
||||
+MODULE_ALIAS_CRYPTO("salsa20-generic");
|
||||
diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c
|
||||
index a53b5e2..94970a7 100644
|
||||
--- a/crypto/serpent_generic.c
|
||||
+++ b/crypto/serpent_generic.c
|
||||
@@ -667,3 +667,4 @@ MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Ci
|
||||
MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>");
|
||||
MODULE_ALIAS_CRYPTO("tnepres");
|
||||
MODULE_ALIAS_CRYPTO("serpent");
|
||||
+MODULE_ALIAS_CRYPTO("serpent-generic");
|
||||
diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c
|
||||
index 039e58c..a3e50c3 100644
|
||||
--- a/crypto/sha1_generic.c
|
||||
+++ b/crypto/sha1_generic.c
|
||||
@@ -154,3 +154,4 @@ MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
|
||||
|
||||
MODULE_ALIAS_CRYPTO("sha1");
|
||||
+MODULE_ALIAS_CRYPTO("sha1-generic");
|
||||
diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
|
||||
index 5eb21b1..b001ff5 100644
|
||||
--- a/crypto/sha256_generic.c
|
||||
+++ b/crypto/sha256_generic.c
|
||||
@@ -385,4 +385,6 @@ MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm");
|
||||
|
||||
MODULE_ALIAS_CRYPTO("sha224");
|
||||
+MODULE_ALIAS_CRYPTO("sha224-generic");
|
||||
MODULE_ALIAS_CRYPTO("sha256");
|
||||
+MODULE_ALIAS_CRYPTO("sha256-generic");
|
||||
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
|
||||
index 8d0b19e..1c3c376 100644
|
||||
--- a/crypto/sha512_generic.c
|
||||
+++ b/crypto/sha512_generic.c
|
||||
@@ -289,4 +289,6 @@ MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms");
|
||||
|
||||
MODULE_ALIAS_CRYPTO("sha384");
|
||||
+MODULE_ALIAS_CRYPTO("sha384-generic");
|
||||
MODULE_ALIAS_CRYPTO("sha512");
|
||||
+MODULE_ALIAS_CRYPTO("sha512-generic");
|
||||
diff --git a/crypto/tea.c b/crypto/tea.c
|
||||
index 495be2d..b70b441 100644
|
||||
--- a/crypto/tea.c
|
||||
+++ b/crypto/tea.c
|
||||
@@ -270,6 +270,7 @@ static void __exit tea_mod_fini(void)
|
||||
crypto_unregister_algs(tea_algs, ARRAY_SIZE(tea_algs));
|
||||
}
|
||||
|
||||
+MODULE_ALIAS_CRYPTO("tea");
|
||||
MODULE_ALIAS_CRYPTO("xtea");
|
||||
MODULE_ALIAS_CRYPTO("xeta");
|
||||
|
||||
diff --git a/crypto/tgr192.c b/crypto/tgr192.c
|
||||
index 6e5651c..321bc6f 100644
|
||||
--- a/crypto/tgr192.c
|
||||
+++ b/crypto/tgr192.c
|
||||
@@ -676,6 +676,7 @@ static void __exit tgr192_mod_fini(void)
|
||||
crypto_unregister_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
|
||||
}
|
||||
|
||||
+MODULE_ALIAS_CRYPTO("tgr192");
|
||||
MODULE_ALIAS_CRYPTO("tgr160");
|
||||
MODULE_ALIAS_CRYPTO("tgr128");
|
||||
|
||||
diff --git a/crypto/twofish_generic.c b/crypto/twofish_generic.c
|
||||
index 523ad8c..ebf7a3e 100644
|
||||
--- a/crypto/twofish_generic.c
|
||||
+++ b/crypto/twofish_generic.c
|
||||
@@ -212,3 +212,4 @@ module_exit(twofish_mod_fini);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
|
||||
MODULE_ALIAS_CRYPTO("twofish");
|
||||
+MODULE_ALIAS_CRYPTO("twofish-generic");
|
||||
diff --git a/crypto/wp512.c b/crypto/wp512.c
|
||||
index 0de42eb..7ee5a04 100644
|
||||
--- a/crypto/wp512.c
|
||||
+++ b/crypto/wp512.c
|
||||
@@ -1167,6 +1167,7 @@ static void __exit wp512_mod_fini(void)
|
||||
crypto_unregister_shashes(wp_algs, ARRAY_SIZE(wp_algs));
|
||||
}
|
||||
|
||||
+MODULE_ALIAS_CRYPTO("wp512");
|
||||
MODULE_ALIAS_CRYPTO("wp384");
|
||||
MODULE_ALIAS_CRYPTO("wp256");
|
||||
|
|
@ -1,269 +0,0 @@
|
|||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Mon, 24 Nov 2014 16:32:38 -0800
|
||||
Subject: crypto: include crypto- module prefix in template
|
||||
Origin: https://git.kernel.org/linus/4943ba16bbc2db05115707b3ff7b4874e9e3c560
|
||||
|
||||
This adds the module loading prefix "crypto-" to the template lookup
|
||||
as well.
|
||||
|
||||
For example, attempting to load 'vfat(blowfish)' via AF_ALG now correctly
|
||||
includes the "crypto-" prefix at every level, correctly rejecting "vfat":
|
||||
|
||||
net-pf-38
|
||||
algif-hash
|
||||
crypto-vfat(blowfish)
|
||||
crypto-vfat(blowfish)-all
|
||||
crypto-vfat
|
||||
|
||||
Reported-by: Mathias Krause <minipli@googlemail.com>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Acked-by: Mathias Krause <minipli@googlemail.com>
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
---
|
||||
arch/x86/crypto/fpu.c | 3 +++
|
||||
crypto/algapi.c | 4 ++--
|
||||
crypto/authenc.c | 1 +
|
||||
crypto/authencesn.c | 1 +
|
||||
crypto/cbc.c | 1 +
|
||||
crypto/ccm.c | 1 +
|
||||
crypto/chainiv.c | 1 +
|
||||
crypto/cmac.c | 1 +
|
||||
crypto/cryptd.c | 1 +
|
||||
crypto/ctr.c | 1 +
|
||||
crypto/cts.c | 1 +
|
||||
crypto/ecb.c | 1 +
|
||||
crypto/eseqiv.c | 1 +
|
||||
crypto/gcm.c | 1 +
|
||||
crypto/hmac.c | 1 +
|
||||
crypto/lrw.c | 1 +
|
||||
crypto/mcryptd.c | 1 +
|
||||
crypto/pcbc.c | 1 +
|
||||
crypto/pcrypt.c | 1 +
|
||||
crypto/seqiv.c | 1 +
|
||||
crypto/vmac.c | 1 +
|
||||
crypto/xcbc.c | 1 +
|
||||
crypto/xts.c | 1 +
|
||||
23 files changed, 26 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/crypto/fpu.c b/arch/x86/crypto/fpu.c
|
||||
index 98d7a18..f368ba2 100644
|
||||
--- a/arch/x86/crypto/fpu.c
|
||||
+++ b/arch/x86/crypto/fpu.c
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/crypto.h>
|
||||
#include <asm/i387.h>
|
||||
|
||||
struct crypto_fpu_ctx {
|
||||
@@ -159,3 +160,5 @@ void __exit crypto_fpu_exit(void)
|
||||
{
|
||||
crypto_unregister_template(&crypto_fpu_tmpl);
|
||||
}
|
||||
+
|
||||
+MODULE_ALIAS_CRYPTO("fpu");
|
||||
diff --git a/crypto/algapi.c b/crypto/algapi.c
|
||||
index e8d3a7d..71a8143 100644
|
||||
--- a/crypto/algapi.c
|
||||
+++ b/crypto/algapi.c
|
||||
@@ -509,8 +509,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name)
|
||||
|
||||
struct crypto_template *crypto_lookup_template(const char *name)
|
||||
{
|
||||
- return try_then_request_module(__crypto_lookup_template(name), "%s",
|
||||
- name);
|
||||
+ return try_then_request_module(__crypto_lookup_template(name),
|
||||
+ "crypto-%s", name);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(crypto_lookup_template);
|
||||
|
||||
diff --git a/crypto/authenc.c b/crypto/authenc.c
|
||||
index e122355..78fb16c 100644
|
||||
--- a/crypto/authenc.c
|
||||
+++ b/crypto/authenc.c
|
||||
@@ -721,3 +721,4 @@ module_exit(crypto_authenc_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Simple AEAD wrapper for IPsec");
|
||||
+MODULE_ALIAS_CRYPTO("authenc");
|
||||
diff --git a/crypto/authencesn.c b/crypto/authencesn.c
|
||||
index 4be0dd4..024bff2 100644
|
||||
--- a/crypto/authencesn.c
|
||||
+++ b/crypto/authencesn.c
|
||||
@@ -814,3 +814,4 @@ module_exit(crypto_authenc_esn_module_exit);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");
|
||||
MODULE_DESCRIPTION("AEAD wrapper for IPsec with extended sequence numbers");
|
||||
+MODULE_ALIAS_CRYPTO("authencesn");
|
||||
diff --git a/crypto/cbc.c b/crypto/cbc.c
|
||||
index 61ac42e..780ee27 100644
|
||||
--- a/crypto/cbc.c
|
||||
+++ b/crypto/cbc.c
|
||||
@@ -289,3 +289,4 @@ module_exit(crypto_cbc_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("CBC block cipher algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("cbc");
|
||||
diff --git a/crypto/ccm.c b/crypto/ccm.c
|
||||
index 647575b..003bbbd 100644
|
||||
--- a/crypto/ccm.c
|
||||
+++ b/crypto/ccm.c
|
||||
@@ -881,3 +881,4 @@ MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Counter with CBC MAC");
|
||||
MODULE_ALIAS_CRYPTO("ccm_base");
|
||||
MODULE_ALIAS_CRYPTO("rfc4309");
|
||||
+MODULE_ALIAS_CRYPTO("ccm");
|
||||
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
|
||||
index 9c294c8..63c17d5 100644
|
||||
--- a/crypto/chainiv.c
|
||||
+++ b/crypto/chainiv.c
|
||||
@@ -359,3 +359,4 @@ module_exit(chainiv_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Chain IV Generator");
|
||||
+MODULE_ALIAS_CRYPTO("chainiv");
|
||||
diff --git a/crypto/cmac.c b/crypto/cmac.c
|
||||
index 50880cf..7a8bfbd 100644
|
||||
--- a/crypto/cmac.c
|
||||
+++ b/crypto/cmac.c
|
||||
@@ -313,3 +313,4 @@ module_exit(crypto_cmac_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("CMAC keyed hash algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("cmac");
|
||||
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
|
||||
index e592c90..650afac1 100644
|
||||
--- a/crypto/cryptd.c
|
||||
+++ b/crypto/cryptd.c
|
||||
@@ -955,3 +955,4 @@ module_exit(cryptd_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Software async crypto daemon");
|
||||
+MODULE_ALIAS_CRYPTO("cryptd");
|
||||
diff --git a/crypto/ctr.c b/crypto/ctr.c
|
||||
index 3d81ff7..2386f73 100644
|
||||
--- a/crypto/ctr.c
|
||||
+++ b/crypto/ctr.c
|
||||
@@ -467,3 +467,4 @@ module_exit(crypto_ctr_module_exit);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("CTR Counter block mode");
|
||||
MODULE_ALIAS_CRYPTO("rfc3686");
|
||||
+MODULE_ALIAS_CRYPTO("ctr");
|
||||
diff --git a/crypto/cts.c b/crypto/cts.c
|
||||
index 133f087..bd94058 100644
|
||||
--- a/crypto/cts.c
|
||||
+++ b/crypto/cts.c
|
||||
@@ -351,3 +351,4 @@ module_exit(crypto_cts_module_exit);
|
||||
|
||||
MODULE_LICENSE("Dual BSD/GPL");
|
||||
MODULE_DESCRIPTION("CTS-CBC CipherText Stealing for CBC");
|
||||
+MODULE_ALIAS_CRYPTO("cts");
|
||||
diff --git a/crypto/ecb.c b/crypto/ecb.c
|
||||
index 935cfef..12011af 100644
|
||||
--- a/crypto/ecb.c
|
||||
+++ b/crypto/ecb.c
|
||||
@@ -185,3 +185,4 @@ module_exit(crypto_ecb_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("ECB block cipher algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("ecb");
|
||||
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c
|
||||
index bf7ab4a..f116fae 100644
|
||||
--- a/crypto/eseqiv.c
|
||||
+++ b/crypto/eseqiv.c
|
||||
@@ -267,3 +267,4 @@ module_exit(eseqiv_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Encrypted Sequence Number IV Generator");
|
||||
+MODULE_ALIAS_CRYPTO("eseqiv");
|
||||
diff --git a/crypto/gcm.c b/crypto/gcm.c
|
||||
index aefb74a..2e403f6 100644
|
||||
--- a/crypto/gcm.c
|
||||
+++ b/crypto/gcm.c
|
||||
@@ -1444,3 +1444,4 @@ MODULE_AUTHOR("Mikko Herranen <mh1@iki.fi>");
|
||||
MODULE_ALIAS_CRYPTO("gcm_base");
|
||||
MODULE_ALIAS_CRYPTO("rfc4106");
|
||||
MODULE_ALIAS_CRYPTO("rfc4543");
|
||||
+MODULE_ALIAS_CRYPTO("gcm");
|
||||
diff --git a/crypto/hmac.c b/crypto/hmac.c
|
||||
index e392219..72e38c0 100644
|
||||
--- a/crypto/hmac.c
|
||||
+++ b/crypto/hmac.c
|
||||
@@ -268,3 +268,4 @@ module_exit(hmac_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("HMAC hash algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("hmac");
|
||||
diff --git a/crypto/lrw.c b/crypto/lrw.c
|
||||
index ba42acc..6f9908a 100644
|
||||
--- a/crypto/lrw.c
|
||||
+++ b/crypto/lrw.c
|
||||
@@ -400,3 +400,4 @@ module_exit(crypto_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("LRW block cipher mode");
|
||||
+MODULE_ALIAS_CRYPTO("lrw");
|
||||
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c
|
||||
index b39fbd5..a8e8704 100644
|
||||
--- a/crypto/mcryptd.c
|
||||
+++ b/crypto/mcryptd.c
|
||||
@@ -703,3 +703,4 @@ module_exit(mcryptd_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Software async multibuffer crypto daemon");
|
||||
+MODULE_ALIAS_CRYPTO("mcryptd");
|
||||
diff --git a/crypto/pcbc.c b/crypto/pcbc.c
|
||||
index d1b8bdf..f654965 100644
|
||||
--- a/crypto/pcbc.c
|
||||
+++ b/crypto/pcbc.c
|
||||
@@ -295,3 +295,4 @@ module_exit(crypto_pcbc_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("PCBC block cipher algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("pcbc");
|
||||
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
|
||||
index 309d345..c305d41 100644
|
||||
--- a/crypto/pcrypt.c
|
||||
+++ b/crypto/pcrypt.c
|
||||
@@ -565,3 +565,4 @@ module_exit(pcrypt_exit);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");
|
||||
MODULE_DESCRIPTION("Parallel crypto wrapper");
|
||||
+MODULE_ALIAS_CRYPTO("pcrypt");
|
||||
diff --git a/crypto/seqiv.c b/crypto/seqiv.c
|
||||
index ee190fc..9daa854c 100644
|
||||
--- a/crypto/seqiv.c
|
||||
+++ b/crypto/seqiv.c
|
||||
@@ -362,3 +362,4 @@ module_exit(seqiv_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Sequence Number IV Generator");
|
||||
+MODULE_ALIAS_CRYPTO("seqiv");
|
||||
diff --git a/crypto/vmac.c b/crypto/vmac.c
|
||||
index d84c24b..df76a81 100644
|
||||
--- a/crypto/vmac.c
|
||||
+++ b/crypto/vmac.c
|
||||
@@ -713,3 +713,4 @@ module_exit(vmac_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("VMAC hash algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("vmac");
|
||||
diff --git a/crypto/xcbc.c b/crypto/xcbc.c
|
||||
index a5fbdf3..df90b33 100644
|
||||
--- a/crypto/xcbc.c
|
||||
+++ b/crypto/xcbc.c
|
||||
@@ -286,3 +286,4 @@ module_exit(crypto_xcbc_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("XCBC keyed hash algorithm");
|
||||
+MODULE_ALIAS_CRYPTO("xcbc");
|
||||
diff --git a/crypto/xts.c b/crypto/xts.c
|
||||
index ca1608f..f6fd43f 100644
|
||||
--- a/crypto/xts.c
|
||||
+++ b/crypto/xts.c
|
||||
@@ -362,3 +362,4 @@ module_exit(crypto_module_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("XTS block cipher mode");
|
||||
+MODULE_ALIAS_CRYPTO("xts");
|
File diff suppressed because it is too large
Load Diff
|
@ -76,8 +76,5 @@ features/all/of-add-optional-options-parameter-to-of_find_node_by.patch
|
|||
features/all/of-support-passing-console-options-with-stdout-path.patch
|
||||
features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch
|
||||
|
||||
bugfix/all/crypto-prefix-module-autoloading-with-crypto.patch
|
||||
bugfix/all/crypto-include-crypto-module-prefix-in-template.patch
|
||||
bugfix/all/crypto-add-missing-crypto-module-aliases.patch
|
||||
bugfix/x86/kvm-x86-fix-of-previously-incomplete-fix-for-cve-201.patch
|
||||
bugfix/x86/kvm-x86-sysenter-emulation-is-broken.patch
|
||||
|
|
Loading…
Reference in New Issue