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

Commit 22628890 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a regression that arose from the change to add a crypto
  prefix to module names which was done to prevent the loading of
  arbitrary modules through the Crypto API.

  In particular, a number of modules were missing the crypto prefix
  which meant that they could no longer be autoloaded"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: add missing crypto module aliases
parents b62a9c20 3e14dcf7

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");