1 files changed, 173 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1ca0b246f29f..6563366bae80 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -336,6 +336,15 @@ config CRYPTO_CRC32C_INTEL
           gain performance compared with software implementation.
           Module will be crc32c-intel.
 
+config CRYPTO_CRC32C_SPARC64
+        tristate "CRC32c CRC algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_HASH
+        select CRC32
+        help
+          CRC32c CRC algorithm implemented using sparc64 crypto instructions,
+          when available.
+
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
         select CRYPTO_GF128MUL
@@ -354,6 +363,15 @@ config CRYPTO_MD5
         help
           MD5 message digest algorithm (RFC1321).
 
+config CRYPTO_MD5_SPARC64
+        tristate "MD5 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_MD5
+        select CRYPTO_HASH
+        help
+          MD5 message digest algorithm (RFC1321) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_MICHAEL_MIC
         tristate "Michael MIC keyed digest algorithm"
         select CRYPTO_HASH
@@ -433,6 +451,24 @@ config CRYPTO_SHA1_SSSE3
           using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
           Extensions (AVX), when available.
 
+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_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
@@ -445,6 +481,15 @@ config CRYPTO_SHA256
           This code also includes SHA-224, a 224 bit hash with 112 bits
           of security against collision attacks.
 
+config CRYPTO_SHA256_SPARC64
+        tristate "SHA224 and SHA256 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA256
+        select CRYPTO_HASH
+        help
+          SHA-256 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_SHA512
         tristate "SHA384 and SHA512 digest algorithms"
         select CRYPTO_HASH
@@ -457,6 +502,15 @@ config CRYPTO_SHA512
           This code also includes SHA-384, a 384 bit hash with 192 bits
           of security against collision attacks.
 
+config CRYPTO_SHA512_SPARC64
+        tristate "SHA384 and SHA512 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA512
+        select CRYPTO_HASH
+        help
+          SHA-512 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_TGR192
         tristate "Tiger digest algorithms"
         select CRYPTO_HASH
@@ -564,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.
 
@@ -588,6 +644,58 @@ config CRYPTO_AES_NI_INTEL
           ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
           acceleration for CTR.
 
+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_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
@@ -685,6 +793,22 @@ config CRYPTO_CAMELLIA_X86_64
           See also:
           <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
+config CRYPTO_CAMELLIA_SPARC64
+        tristate "Camellia cipher algorithm (SPARC64)"
+        depends on SPARC64
+        depends on CRYPTO
+        select CRYPTO_ALGAPI
+        help
+          Camellia cipher algorithm module (SPARC64).
+
+          Camellia is a symmetric key block cipher developed jointly
+          at NTT and Mitsubishi Electric Corporation.
+
+          The Camellia specifies three key sizes: 128, 192 and 256 bits.
+
+          See also:
+          <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+
 config CRYPTO_CAST5
         tristate "CAST5 (CAST-128) cipher algorithm"
         select CRYPTO_ALGAPI
@@ -692,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
@@ -699,12 +837,38 @@ 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
         help
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
+config CRYPTO_DES_SPARC64
+        tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_ALGAPI
+        select CRYPTO_DES
+        help
+          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
+          optimized using SPARC64 crypto opcodes.
+
 config CRYPTO_FCRYPT
         tristate "FCrypt cipher algorithm"
         select CRYPTO_ALGAPI
@@ -1008,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