diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-11-05 18:06:26 +1100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-09 14:15:39 -0800 |
| commit | c8a19c91b5b488fed8cce04200a84c6a35c0bf0c (patch) | |
| tree | e0296c60f7601c5a1d1cf5fa9afd0e38f92e6995 /crypto | |
| parent | 5cb1454b862ab3040b78364d58330262fea1ddba (diff) | |
| download | linux-stable-c8a19c91b5b488fed8cce04200a84c6a35c0bf0c.tar.gz linux-stable-c8a19c91b5b488fed8cce04200a84c6a35c0bf0c.tar.bz2 linux-stable-c8a19c91b5b488fed8cce04200a84c6a35c0bf0c.zip | |
[CRYPTO] Allow AES C/ASM implementations to coexist
As the Crypto API now allows multiple implementations to be registered
for the same algorithm, we no longer have to play tricks with Kconfig
to select the right AES implementation.
This patch sets the driver name and priority for all the AES
implementations and removes the Kconfig conditions on the C implementation
for AES.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 2 | ||||
| -rw-r--r-- | crypto/aes.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 52e1d4108a99..c442f2e7ce46 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -157,7 +157,7 @@ config CRYPTO_SERPENT config CRYPTO_AES tristate "AES cipher algorithms" - depends on CRYPTO && !(X86 || UML_X86) + depends on CRYPTO help AES cipher algorithms (FIPS-197). AES uses the Rijndael algorithm. diff --git a/crypto/aes.c b/crypto/aes.c index 35a11deef29b..b9b2afb42792 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -418,6 +418,8 @@ static void aes_decrypt(void *ctx_arg, u8 *out, const u8 *in) static struct crypto_alg aes_alg = { .cra_name = "aes", + .cra_driver_name = "aes-generic", + .cra_priority = 100, .cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct aes_ctx), |