Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 086fcec..4ca0ab3 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -16,6 +16,10 @@ config CRYPTO_ALGAPI
        help
          This option provides the API for cryptographic algorithms.
 
        help
          This option provides the API for cryptographic algorithms.
 

+config CRYPTO_ABLKCIPHER
+       tristate
+       select CRYPTO_BLKCIPHER
+

 config CRYPTO_BLKCIPHER
        tristate
        select CRYPTO_ALGAPI
 config CRYPTO_BLKCIPHER
        tristate
        select CRYPTO_ALGAPI


@@ -171,6 +175,15 @@ 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.
 
          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_CRYPTD
+       tristate "Software async crypto daemon"
+       select CRYPTO_ABLKCIPHER
+       select CRYPTO_MANAGER
+       help
+         This is a generic software asynchronous crypto daemon that
+         converts an arbitrary synchronous software crypto algorithm
+         into an asynchronous algorithm that executes in a kernel thread.
+

 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        select CRYPTO_ALGAPI
 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        select CRYPTO_ALGAPI


@@ -258,7 +271,7 @@ config CRYPTO_SERPENT
 
          Keys are allowed to be from 0 to 256 bits in length, in steps
          of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
 
          Keys are allowed to be from 0 to 256 bits in length, in steps
          of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed

-         variant of Serpent for compatibility with old kerneli code.
+         variant of Serpent for compatibility with old kerneli.org code.

 
          See also:
          <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
          See also:
          <http://www.cl.cam.ac.uk/~rja14/serpent.html>