[Bluetooth] Convert RFCOMM to use kthread API

[pandora-kernel.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index b749a1a..083d2e1 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -5,12 +5,14 @@ config XOR_BLOCKS
        tristate
 
 #
-# Cryptographic API Configuration
+# async_tx api: hardware offloaded memory transfer/transform support
 #
+source "crypto/async_tx/Kconfig"
 
-menu "Cryptographic options"
-
-config CRYPTO
+#
+# Cryptographic API Configuration
+#
+menuconfig CRYPTO
        bool "Cryptographic API"
        help
          This option provides the core Cryptographic API.
@@ -26,6 +28,10 @@ config CRYPTO_ABLKCIPHER
        tristate
        select CRYPTO_BLKCIPHER
 
+config CRYPTO_AEAD
+       tristate
+       select CRYPTO_ALGAPI
+
 config CRYPTO_BLKCIPHER
        tristate
        select CRYPTO_ALGAPI
@@ -144,7 +150,6 @@ config CRYPTO_ECB
        tristate "ECB support"
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
-       default m
        help
          ECB: Electronic CodeBook mode
          This is the simplest block cipher algorithm.  It simply encrypts
@@ -154,7 +159,6 @@ config CRYPTO_CBC
        tristate "CBC support"
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
-       default m
        help
          CBC: Cipher Block Chaining mode
          This block cipher algorithm is required for IPSec.
@@ -163,7 +167,6 @@ config CRYPTO_PCBC
        tristate "PCBC support"
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
-       default m
        help
          PCBC: Propagating Cipher Block Chaining mode
          This block cipher algorithm is required for RxRPC.
@@ -181,6 +184,17 @@ config CRYPTO_LRW
          The first 128, 192 or 256 bits in the key are used for AES and the
          rest is used to tie each cipher block to its logical position.
 
+config CRYPTO_XTS
+       tristate "XTS support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
+       select CRYPTO_GF128MUL
+       help
+         XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,
+         key size 256, 384 or 512 bits. This implementation currently
+         can't handle a sectorsize which is not a multiple of 16 bytes.
+
 config CRYPTO_CRYPTD
        tristate "Software async crypto daemon"
        select CRYPTO_ABLKCIPHER
@@ -413,6 +427,20 @@ config CRYPTO_ANUBIS
          <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
          <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
 
+config CRYPTO_SEED
+       tristate "SEED cipher algorithm"
+       select CRYPTO_ALGAPI
+       help
+         SEED cipher algorithm (RFC4269).
+
+         SEED is a 128-bit symmetric key block cipher that has been
+         developed by KISA (Korea Information Security Agency) as a
+         national standard encryption algorithm of the Republic of Korea.
+         It is a 16 round block cipher with the key size of 128 bit.
+
+         See also:
+         <http://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp>
+
 
 config CRYPTO_DEFLATE
        tristate "Deflate compression algorithm"
@@ -466,8 +494,14 @@ config CRYPTO_TEST
        help
          Quick & dirty crypto test module.
 
+config CRYPTO_AUTHENC
+       tristate "Authenc support"
+       select CRYPTO_AEAD
+       select CRYPTO_MANAGER
+       help
+         Authenc: Combined mode wrapper for IPsec.
+         This is required for IPSec.
+
 source "drivers/crypto/Kconfig"
 
 endif  # if CRYPTO
-
-endmenu