From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 02:50:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'crypto/master'
X-Git-Tag: next-20120907~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d761f682cd8764b91f35f3e35a53119d2cecf6d6;p=karo-tx-linux.git

Merge remote-tracking branch 'crypto/master'

Conflicts:
	crypto/Kconfig
---

d761f682cd8764b91f35f3e35a53119d2cecf6d6
diff --cc crypto/Kconfig
index 94f232f96d03,27307981f88e..8a197304b415
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -451,15 -433,15 +451,24 @@@ config CRYPTO_SHA1_SSSE
  	  using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
  	  Extensions (AVX), 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_SHA1_SPARC64
 +	tristate "SHA1 digest algorithm (SPARC64)"
 +	depends on SPARC64
 +	select CRYPTO_SHA1
 +	select CRYPTO_HASH
 +	help
 +	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
 +	  using sparc64 crypto instructions, when available.
 +
  config CRYPTO_SHA256
  	tristate "SHA224 and SHA256 digest algorithm"
  	select CRYPTO_HASH
@@@ -633,34 -599,30 +644,58 @@@ config CRYPTO_AES_NI_INTE
  	  ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
  	  acceleration for CTR.
  
+ 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_AES_SPARC64
 +	tristate "AES cipher algorithms (SPARC64)"
 +	depends on SPARC64
 +	select CRYPTO_CRYPTD
 +	select CRYPTO_ALGAPI
 +	help
 +	  Use SPARC64 crypto opcodes 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.
 +
 +	  In addition to AES cipher algorithm support, the acceleration
 +	  for some popular block cipher mode is supported too, including
 +	  ECB and CBC.
 +
  config CRYPTO_ANUBIS
  	tristate "Anubis cipher algorithm"
  	select CRYPTO_ALGAPI