netconf: advertise mc_forwarding status

[~andy/linux] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 94f232f96d036da6827a6b50c1f46379ff75f840..6563366bae809f8e5b052e003ad42c6c2f2adb33 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -460,6 +460,15 @@ config CRYPTO_SHA1_SPARC64
          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
          using sparc64 crypto instructions, when available.
 
+config CRYPTO_SHA1_ARM
+       tristate "SHA1 digest algorithm (ARM-asm)"
+       depends on ARM
+       select CRYPTO_SHA1
+       select CRYPTO_HASH
+       help
+         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+         using optimized ARM assembler.
+
 config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"
        select CRYPTO_HASH
@@ -609,6 +618,8 @@ config CRYPTO_AES_NI_INTEL
        select CRYPTO_CRYPTD
        select CRYPTO_ABLK_HELPER_X86
        select CRYPTO_ALGAPI
+       select CRYPTO_LRW
+       select CRYPTO_XTS
        help
          Use Intel AES-NI instructions for AES algorithm.
 
@@ -661,6 +672,30 @@ config CRYPTO_AES_SPARC64
          for some popular block cipher mode is supported too, including
          ECB and CBC.
 
+config CRYPTO_AES_ARM
+       tristate "AES cipher algorithms (ARM-asm)"
+       depends on ARM
+       select CRYPTO_ALGAPI
+       select CRYPTO_AES
+       help
+         Use optimized AES assembler routines for ARM platforms.
+
+         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_ANUBIS
        tristate "Anubis cipher algorithm"
        select CRYPTO_ALGAPI
@@ -781,6 +816,20 @@ config CRYPTO_CAST5
          The CAST5 encryption algorithm (synonymous with CAST-128) is
          described in RFC2144.
 
+config CRYPTO_CAST5_AVX_X86_64
+       tristate "CAST5 (CAST-128) cipher algorithm (x86_64/AVX)"
+       depends on X86 && 64BIT
+       select CRYPTO_ALGAPI
+       select CRYPTO_CRYPTD
+       select CRYPTO_ABLK_HELPER_X86
+       select CRYPTO_CAST5
+       help
+         The CAST5 encryption algorithm (synonymous with CAST-128) is
+         described in RFC2144.
+
+         This module provides the Cast5 cipher algorithm that processes
+         sixteen blocks parallel using the AVX instruction set.
+
 config CRYPTO_CAST6
        tristate "CAST6 (CAST-256) cipher algorithm"
        select CRYPTO_ALGAPI
@@ -788,6 +837,23 @@ config CRYPTO_CAST6
          The CAST6 encryption algorithm (synonymous with CAST-256) is
          described in RFC2612.
 
+config CRYPTO_CAST6_AVX_X86_64
+       tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)"
+       depends on X86 && 64BIT
+       select CRYPTO_ALGAPI
+       select CRYPTO_CRYPTD
+       select CRYPTO_ABLK_HELPER_X86
+       select CRYPTO_GLUE_HELPER_X86
+       select CRYPTO_CAST6
+       select CRYPTO_LRW
+       select CRYPTO_XTS
+       help
+         The CAST6 encryption algorithm (synonymous with CAST-256) is
+         described in RFC2612.
+
+         This module provides the Cast6 cipher algorithm that processes
+         eight blocks parallel using the AVX instruction set.
+
 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        select CRYPTO_ALGAPI
@@ -796,6 +862,7 @@ config CRYPTO_DES
 
 config CRYPTO_DES_SPARC64
        tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
+       depends on SPARC64
        select CRYPTO_ALGAPI
        select CRYPTO_DES
        help
@@ -1105,6 +1172,15 @@ config CRYPTO_LZO
        help
          This is the LZO algorithm.
 
+config CRYPTO_842
+       tristate "842 compression algorithm"
+       depends on CRYPTO_DEV_NX_COMPRESS
+       # 842 uses lzo if the hardware becomes unavailable
+       select LZO_COMPRESS
+       select LZO_DECOMPRESS
+       help
+         This is the 842 algorithm.
+
 comment "Random Number Generation"
 
 config CRYPTO_ANSI_CPRNG
@@ -1140,5 +1216,6 @@ config CRYPTO_USER_API_SKCIPHER
          key cipher algorithms.
 
 source "drivers/crypto/Kconfig"
+source crypto/asymmetric_keys/Kconfig
 
 endif  # if CRYPTO