crypto: cryptd - Add finup/export/import for hash

[safe/jmp/linux-2.6] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 66ff22a..f2002d8 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -23,6 +23,7 @@ comment "Crypto core or helper"
 
 config CRYPTO_FIPS
        bool "FIPS 200 compliance"
 
 config CRYPTO_FIPS
        bool "FIPS 200 compliance"

+       select CRYPTO_ANSI_CPRNG

        help
          This options enables the fips boot option which is
          required if you want to system to operate in a FIPS 200
        help
          This options enables the fips boot option which is
          required if you want to system to operate in a FIPS 200


@@ -491,6 +492,7 @@ config CRYPTO_AES_NI_INTEL
        select CRYPTO_AES_X86_64
        select CRYPTO_CRYPTD
        select CRYPTO_ALGAPI
        select CRYPTO_AES_X86_64
        select CRYPTO_CRYPTD
        select CRYPTO_ALGAPI

+       select CRYPTO_FPU

        help
          Use Intel AES-NI instructions for AES algorithm.
 
        help
          Use Intel AES-NI instructions for AES algorithm.
 


@@ -510,6 +512,10 @@ config CRYPTO_AES_NI_INTEL
 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 
 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 

+         In addition to AES cipher algorithm support, the
+         acceleration for some popular block cipher mode is supported
+         too, including ECB, CBC, CTR, LRW, PCBC, XTS.
+

 config CRYPTO_ANUBIS
        tristate "Anubis cipher algorithm"
        select CRYPTO_ALGAPI
 config CRYPTO_ANUBIS
        tristate "Anubis cipher algorithm"
        select CRYPTO_ALGAPI


@@ -777,7 +783,6 @@ config CRYPTO_ANSI_CPRNG
        tristate "Pseudo Random Number Generation for Cryptographic modules"
        select CRYPTO_AES
        select CRYPTO_RNG
        tristate "Pseudo Random Number Generation for Cryptographic modules"
        select CRYPTO_AES
        select CRYPTO_RNG

-       select CRYPTO_FIPS

        help
          This option enables the generic pseudo random number generator
          for cryptographic modules.  Uses the Algorithm specified in
        help
          This option enables the generic pseudo random number generator
          for cryptographic modules.  Uses the Algorithm specified in