diff options
| author | Sebastian Siewior <sebastian@breakpoint.cc> | 2007-10-08 07:45:10 +0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 03:55:50 +0400 |
| commit | ad5d27899fdbe7a66e57fdf1af883dbd7ff88dac (patch) | |
| tree | 666a5809fd9a01e0798411b94962903c3431400c /crypto | |
| parent | f8246af005d56b73f4f04304fc5b6fd9878af4ef (diff) | |
| download | linux-ad5d27899fdbe7a66e57fdf1af883dbd7ff88dac.tar.xz | |
[CRYPTO] sha: Load the SHA[1|256] module by an alias
Loading the crypto algorithm by the alias instead of by module directly
has the advantage that all possible implementations of this algorithm
are loaded automatically and the crypto API can choose the best one
depending on its priority.
Additionally it ensures that the generic implementation as well as the
HW driver (if available) is loaded in case the HW driver needs the
generic version as fallback in corner cases.
Also remove the probe for sha1 in padlock's init code.
Quote from Herbert:
The probe is actually pointless since we can always probe when
the algorithm is actually used which does not lead to dead-locks
like this.
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile | 4 | ||||
| -rw-r--r-- | crypto/sha1_generic.c (renamed from crypto/sha1.c) | 2 | ||||
| -rw-r--r-- | crypto/sha256_generic.c (renamed from crypto/sha256.c) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index b6ef5e4f1ab4..43c2a0dc9936 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -21,8 +21,8 @@ obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o obj-$(CONFIG_CRYPTO_MD4) += md4.o obj-$(CONFIG_CRYPTO_MD5) += md5.o -obj-$(CONFIG_CRYPTO_SHA1) += sha1.o -obj-$(CONFIG_CRYPTO_SHA256) += sha256.o +obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o +obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o obj-$(CONFIG_CRYPTO_SHA512) += sha512.o obj-$(CONFIG_CRYPTO_WP512) += wp512.o obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o diff --git a/crypto/sha1.c b/crypto/sha1_generic.c index 1bba551e5b45..70364dd5c45a 100644 --- a/crypto/sha1.c +++ b/crypto/sha1_generic.c @@ -139,4 +139,4 @@ module_exit(fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm"); -MODULE_ALIAS("sha1-generic"); +MODULE_ALIAS("sha1"); diff --git a/crypto/sha256.c b/crypto/sha256_generic.c index 716195bb54f2..74bf2f95f4e5 100644 --- a/crypto/sha256.c +++ b/crypto/sha256_generic.c @@ -339,4 +339,4 @@ module_exit(fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm"); -MODULE_ALIAS("sha256-generic"); +MODULE_ALIAS("sha256"); |