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

Pull crypto update from Herbert Xu:
 - Optimised AES/SHA1 for ARM.
 - IPsec ESN support in talitos and caam.
 - x86_64/avx implementation of cast5/cast6.
 - Add/use multi-algorithm registration helpers where possible.
 - Added IBM Power7+ in-Nest support.
 - Misc fixes.

Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
config options being added next to the new ARM ones.

[ Side note: cut-and-paste duplicate help texts make those conflicts
  harder to read than necessary, thanks to git being smart about
  minimizing conflicts and maximizing the common parts... ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: x86/glue_helper - fix storing of new IV in CBC encryption
  crypto: cast5/avx - fix storing of new IV in CBC encryption
  crypto: tcrypt - add missing tests for camellia and ghash
  crypto: testmgr - make test_aead also test 'dst != src' code paths
  crypto: testmgr - make test_skcipher also test 'dst != src' code paths
  crypto: testmgr - add test vectors for CTR mode IV increasement
  crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
  crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
  crypto: caam - increase TRNG clocks per sample
  crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
  crypto: tegra-aes - fix error return code
  crypto: crypto4xx - fix error return code
  crypto: hifn_795x - fix error return code
  crypto: ux500 - fix error return code
  crypto: caam - fix error IDs for SEC v5.x RNG4
  hwrng: mxc-rnga - Access data via structure
  hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
  crypto: caam - add IPsec ESN support
  crypto: 842 - remove .cra_list initialization
  Revert "[CRYPTO] cast6: inline bloat--"
  ...

1 files changed, 75 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 957cc56ce4b9..50402dc0ea35 100644
--- 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
@@ -1106,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