diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/Kconfig | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 90d6089d60ed..256c0b1fed10 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -146,7 +146,7 @@ config CRYPTO_SERPENT | |||
146 | 146 | ||
147 | config CRYPTO_AES | 147 | config CRYPTO_AES |
148 | tristate "AES cipher algorithms" | 148 | tristate "AES cipher algorithms" |
149 | depends on CRYPTO && !((X86 || UML_X86) && !64BIT) | 149 | depends on CRYPTO && !(X86 || UML_X86) |
150 | help | 150 | help |
151 | AES cipher algorithms (FIPS-197). AES uses the Rijndael | 151 | AES cipher algorithms (FIPS-197). AES uses the Rijndael |
152 | algorithm. | 152 | algorithm. |
@@ -184,6 +184,26 @@ config CRYPTO_AES_586 | |||
184 | 184 | ||
185 | See <http://csrc.nist.gov/encryption/aes/> for more information. | 185 | See <http://csrc.nist.gov/encryption/aes/> for more information. |
186 | 186 | ||
187 | config CRYPTO_AES_X86_64 | ||
188 | tristate "AES cipher algorithms (x86_64)" | ||
189 | depends on CRYPTO && ((X86 || UML_X86) && 64BIT) | ||
190 | help | ||
191 | AES cipher algorithms (FIPS-197). AES uses the Rijndael | ||
192 | algorithm. | ||
193 | |||
194 | Rijndael appears to be consistently a very good performer in | ||
195 | both hardware and software across a wide range of computing | ||
196 | environments regardless of its use in feedback or non-feedback | ||
197 | modes. Its key setup time is excellent, and its key agility is | ||
198 | good. Rijndael's very low memory requirements make it very well | ||
199 | suited for restricted-space environments, in which it also | ||
200 | demonstrates excellent performance. Rijndael's operations are | ||
201 | among the easiest to defend against power and timing attacks. | ||
202 | |||
203 | The AES specifies three key sizes: 128, 192 and 256 bits | ||
204 | |||
205 | See <http://csrc.nist.gov/encryption/aes/> for more information. | ||
206 | |||
187 | config CRYPTO_CAST5 | 207 | config CRYPTO_CAST5 |
188 | tristate "CAST5 (CAST-128) cipher algorithm" | 208 | tristate "CAST5 (CAST-128) cipher algorithm" |
189 | depends on CRYPTO | 209 | depends on CRYPTO |