linux-kernel - linux-next: manual merge of the crypto tree with the sparc-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 7 Sep 2012 12:51:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David McCullough <david_mccullough@...fee.com>,
	"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the crypto tree with the sparc-next
 tree

Hi Herbert,

Today's linux-next merge of the crypto tree got conflicts in
crypto/Kconfig between commits 4ff28d4ca93b ("sparc64: Add SHA1 driver
making use of the 'sha1' instruction") and 9bf4852d3d19 ("sparc64: Add
AES driver making use of the new aes opcodes") from the sparc-next tree
and commit f0be44f4fb1f ("arm/crypto: Add optimized AES and SHA1
routines") from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc crypto/Kconfig
index 94f232f,2730798..0000000
--- 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

Content of type "application/pgp-signature" skipped