Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (29 commits)
  crypto: sha512-s390 - Add missing block size
  hwrng: timeriomem - Breaks an allyesconfig build on s390:
  nlattr: Fix build error with NET off
  crypto: testmgr - add zlib test
  crypto: zlib - New zlib crypto module, using pcomp
  crypto: testmgr - Add support for the pcomp interface
  crypto: compress - Add pcomp interface
  netlink: Move netlink attribute parsing support to lib
  crypto: Fix dead links
  hwrng: timeriomem - New driver
  crypto: chainiv - Use kcrypto_wq instead of keventd_wq
  crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq
  crypto: api - Use dedicated workqueue for crypto subsystem
  crypto: testmgr - Test skciphers with no IVs
  crypto: aead - Avoid infinite loop when nivaead fails selftest
  crypto: skcipher - Avoid infinite loop when cipher fails selftest
  crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
  crypto: api - crypto_alg_mod_lookup either tested or untested
  crypto: amcc - Add crypt4xx driver
  crypto: ansi_cprng - Add maintainer
  ...

1 files changed, 44 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 8dde4fcf99c9..74d0e622a515 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -56,6 +56,7 @@ config CRYPTO_BLKCIPHER2
         tristate
         select CRYPTO_ALGAPI2
         select CRYPTO_RNG2
+        select CRYPTO_WORKQUEUE
 
 config CRYPTO_HASH
         tristate
@@ -75,6 +76,10 @@ config CRYPTO_RNG2
         tristate
         select CRYPTO_ALGAPI2
 
+config CRYPTO_PCOMP
+        tristate
+        select CRYPTO_ALGAPI2
+
 config CRYPTO_MANAGER
         tristate "Cryptographic algorithm manager"
         select CRYPTO_MANAGER2
@@ -87,6 +92,7 @@ config CRYPTO_MANAGER2
         select CRYPTO_AEAD2
         select CRYPTO_HASH2
         select CRYPTO_BLKCIPHER2
+        select CRYPTO_PCOMP
 
 config CRYPTO_GF128MUL
         tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
@@ -106,11 +112,15 @@ config CRYPTO_NULL
         help
           These are 'Null' algorithms, used by IPsec, which do nothing.
 
+config CRYPTO_WORKQUEUE
+       tristate
+
 config CRYPTO_CRYPTD
         tristate "Software async crypto daemon"
         select CRYPTO_BLKCIPHER
         select CRYPTO_HASH
         select CRYPTO_MANAGER
+        select CRYPTO_WORKQUEUE
         help
           This is a generic software asynchronous crypto daemon that
           converts an arbitrary synchronous software crypto algorithm
@@ -470,6 +480,31 @@ config CRYPTO_AES_X86_64
 
           See <http://csrc.nist.gov/encryption/aes/> for more information.
 
+config CRYPTO_AES_NI_INTEL
+        tristate "AES cipher algorithms (AES-NI)"
+        depends on (X86 || UML_X86) && 64BIT
+        select CRYPTO_AES_X86_64
+        select CRYPTO_CRYPTD
+        select CRYPTO_ALGAPI
+        help
+          Use Intel AES-NI instructions for AES algorithm.
+
+          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
@@ -714,6 +749,15 @@ config CRYPTO_DEFLATE
 
           You will most probably want this if using IPSec.
 
+config CRYPTO_ZLIB
+        tristate "Zlib compression algorithm"
+        select CRYPTO_PCOMP
+        select ZLIB_INFLATE
+        select ZLIB_DEFLATE
+        select NLATTR
+        help
+          This is the zlib algorithm.
+
 config CRYPTO_LZO
         tristate "LZO compression algorithm"
         select CRYPTO_ALGAPI