crypto: prefix module autoloading with "crypto-"
authorKees Cook <keescook@chromium.org>
Fri, 21 Nov 2014 01:05:53 +0000 (17:05 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 20 Feb 2015 00:49:36 +0000 (00:49 +0000)
commit 5d26a105b5a73e5635eae0629b42fa0a90e07b7b upstream.

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>
[bwh: Backported to 3.2:
 - Adjust filenames
 - Drop changes to algorithms and drivers we don't have
 - Add aliases to generic C implementations that didn't need them before]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
57 files changed:
arch/s390/crypto/aes_s390.c
arch/s390/crypto/des_s390.c
arch/s390/crypto/ghash_s390.c
arch/s390/crypto/sha1_s390.c
arch/s390/crypto/sha256_s390.c
arch/s390/crypto/sha512_s390.c
arch/x86/crypto/aes_glue.c
arch/x86/crypto/aesni-intel_glue.c
arch/x86/crypto/blowfish_glue.c
arch/x86/crypto/crc32c-intel.c
arch/x86/crypto/ghash-clmulni-intel_glue.c
arch/x86/crypto/salsa20_glue.c
arch/x86/crypto/sha1_ssse3_glue.c
arch/x86/crypto/twofish_glue.c
arch/x86/crypto/twofish_glue_3way.c
crypto/aes_generic.c
crypto/ansi_cprng.c
crypto/anubis.c
crypto/api.c
crypto/arc4.c
crypto/blowfish_generic.c
crypto/camellia.c
crypto/cast5.c
crypto/cast6.c
crypto/ccm.c
crypto/crc32c.c
crypto/crypto_null.c
crypto/ctr.c
crypto/deflate.c
crypto/des_generic.c
crypto/fcrypt.c
crypto/gcm.c
crypto/ghash-generic.c
crypto/khazad.c
crypto/krng.c
crypto/lzo.c
crypto/md4.c
crypto/md5.c
crypto/michael_mic.c
crypto/rmd128.c
crypto/rmd160.c
crypto/rmd256.c
crypto/rmd320.c
crypto/salsa20_generic.c
crypto/seed.c
crypto/serpent.c
crypto/sha1_generic.c
crypto/sha256_generic.c
crypto/sha512_generic.c
crypto/tea.c
crypto/tgr192.c
crypto/twofish_generic.c
crypto/wp512.c
crypto/zlib.c
drivers/crypto/padlock-aes.c
drivers/crypto/padlock-sha.c
include/linux/crypto.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/anubis.c
Simple merge
diff --cc crypto/api.c
Simple merge
diff --cc crypto/arc4.c
Simple merge
Simple merge
Simple merge
diff --cc crypto/cast5.c
Simple merge
diff --cc crypto/cast6.c
Simple merge
diff --cc crypto/ccm.c
Simple merge
diff --cc crypto/crc32c.c
Simple merge
Simple merge
diff --cc crypto/ctr.c
Simple merge
Simple merge
Simple merge
diff --cc crypto/fcrypt.c
Simple merge
diff --cc crypto/gcm.c
Simple merge
Simple merge
diff --cc crypto/khazad.c
Simple merge
diff --cc crypto/krng.c
Simple merge
diff --cc crypto/lzo.c
Simple merge
diff --cc crypto/md4.c
Simple merge
diff --cc crypto/md5.c
Simple merge
Simple merge
diff --cc crypto/rmd128.c
Simple merge
diff --cc crypto/rmd160.c
Simple merge
diff --cc crypto/rmd256.c
Simple merge
diff --cc crypto/rmd320.c
Simple merge
Simple merge
diff --cc crypto/seed.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/tea.c
Simple merge
diff --cc crypto/tgr192.c
Simple merge
Simple merge
diff --cc crypto/wp512.c
Simple merge
diff --cc crypto/zlib.c
Simple merge
Simple merge
Simple merge
Simple merge