diff options
| author | James Morris <jmorris@redhat.com> | 2004-08-04 22:05:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-04 22:05:44 -0700 |
| commit | ce1d89cadec11c657653fd91d1af0e2b630704e4 (patch) | |
| tree | e5d01fa5eb13acc6281e4820f906ce56d602371c /crypto | |
| parent | 30e74fea2a4c91f78fceed7d642535699baa1b67 (diff) | |
| download | history-ce1d89cadec11c657653fd91d1af0e2b630704e4.tar.gz | |
[PATCH] Drop asm i586 AES code.
This patch reverts the i586 AES module. A new one should be ready soon.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 841661f1ee3ee9..de13d3ffb7fece 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -118,9 +118,9 @@ config CRYPTO_SERPENT See also: http://www.cl.cam.ac.uk/~rja14/serpent.html -config CRYPTO_AES_GENERIC +config CRYPTO_AES tristate "AES cipher algorithms" - depends on CRYPTO && !(X86 && !X86_64) + depends on CRYPTO help AES cipher algorithms (FIPS-197). AES uses the Rijndael algorithm. @@ -138,26 +138,6 @@ config CRYPTO_AES_GENERIC See http://csrc.nist.gov/CryptoToolkit/aes/ for more information. -config CRYPTO_AES_586 - tristate "AES cipher algorithms (i586)" - depends on CRYPTO && (X86 && !X86_64) - help - AES cipher algorithms (FIPS-197). AES uses the Rijndael - algorithm. - - Rijndael appears to be consistently a very good performer in - both hardware and software across a wide range of computing - environments regardless of its use in feedback or non-feedback - modes. Its key setup time is excellent, and its key agility is - good. Rijndael's very low memory requirements make it very well - suited for restricted-space environments, in which it also - demonstrates excellent performance. Rijndael's operations are - among the easiest to defend against power and timing attacks. - - The AES specifies three key sizes: 128, 192 and 256 bits - - See http://csrc.nist.gov/encryption/aes/ for more information. - config CRYPTO_CAST5 tristate "CAST5 (CAST-128) cipher algorithm" depends on CRYPTO |