Merge tag 'gcc-plugins-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index df6f0be66574a770e97ea2693211e4a5d4fa7379..ad86463de715fece52e108748630d7a3447f3380 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -306,19 +306,10 @@ config CRYPTO_AEGIS128
        help
         Support for the AEGIS-128 dedicated AEAD algorithm.
 
-config CRYPTO_AEGIS128L
-       tristate "AEGIS-128L AEAD algorithm"
-       select CRYPTO_AEAD
-       select CRYPTO_AES  # for AES S-box tables
-       help
-        Support for the AEGIS-128L dedicated AEAD algorithm.
-
-config CRYPTO_AEGIS256
-       tristate "AEGIS-256 AEAD algorithm"
-       select CRYPTO_AEAD
-       select CRYPTO_AES  # for AES S-box tables
-       help
-        Support for the AEGIS-256 dedicated AEAD algorithm.
+config CRYPTO_AEGIS128_SIMD
+       bool "Support SIMD acceleration for AEGIS-128"
+       depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON)
+       default y
 
 config CRYPTO_AEGIS128_AESNI_SSE2
        tristate "AEGIS-128 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
@@ -328,78 +319,6 @@ config CRYPTO_AEGIS128_AESNI_SSE2
        help
         AESNI+SSE2 implementation of the AEGIS-128 dedicated AEAD algorithm.
 
-config CRYPTO_AEGIS128L_AESNI_SSE2
-       tristate "AEGIS-128L AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
-       depends on X86 && 64BIT
-       select CRYPTO_AEAD
-       select CRYPTO_SIMD
-       help
-        AESNI+SSE2 implementation of the AEGIS-128L dedicated AEAD algorithm.
-
-config CRYPTO_AEGIS256_AESNI_SSE2
-       tristate "AEGIS-256 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
-       depends on X86 && 64BIT
-       select CRYPTO_AEAD
-       select CRYPTO_SIMD
-       help
-        AESNI+SSE2 implementation of the AEGIS-256 dedicated AEAD algorithm.
-
-config CRYPTO_MORUS640
-       tristate "MORUS-640 AEAD algorithm"
-       select CRYPTO_AEAD
-       help
-         Support for the MORUS-640 dedicated AEAD algorithm.
-
-config CRYPTO_MORUS640_GLUE
-       tristate
-       depends on X86
-       select CRYPTO_AEAD
-       select CRYPTO_SIMD
-       help
-         Common glue for SIMD optimizations of the MORUS-640 dedicated AEAD
-         algorithm.
-
-config CRYPTO_MORUS640_SSE2
-       tristate "MORUS-640 AEAD algorithm (x86_64 SSE2 implementation)"
-       depends on X86 && 64BIT
-       select CRYPTO_AEAD
-       select CRYPTO_MORUS640_GLUE
-       help
-         SSE2 implementation of the MORUS-640 dedicated AEAD algorithm.
-
-config CRYPTO_MORUS1280
-       tristate "MORUS-1280 AEAD algorithm"
-       select CRYPTO_AEAD
-       help
-         Support for the MORUS-1280 dedicated AEAD algorithm.
-
-config CRYPTO_MORUS1280_GLUE
-       tristate
-       depends on X86
-       select CRYPTO_AEAD
-       select CRYPTO_SIMD
-       help
-         Common glue for SIMD optimizations of the MORUS-1280 dedicated AEAD
-         algorithm.
-
-config CRYPTO_MORUS1280_SSE2
-       tristate "MORUS-1280 AEAD algorithm (x86_64 SSE2 implementation)"
-       depends on X86 && 64BIT
-       select CRYPTO_AEAD
-       select CRYPTO_MORUS1280_GLUE
-       help
-         SSE2 optimizedimplementation of the MORUS-1280 dedicated AEAD
-         algorithm.
-
-config CRYPTO_MORUS1280_AVX2
-       tristate "MORUS-1280 AEAD algorithm (x86_64 AVX2 implementation)"
-       depends on X86 && 64BIT
-       select CRYPTO_AEAD
-       select CRYPTO_MORUS1280_GLUE
-       help
-         AVX2 optimized implementation of the MORUS-1280 dedicated AEAD
-         algorithm.
-
 config CRYPTO_SEQIV
        tristate "Sequence Number IV Generator"
        select CRYPTO_AEAD
@@ -728,11 +647,12 @@ config CRYPTO_VPMSUM_TESTER
          Unless you are testing these algorithms, you don't need this.
 
 config CRYPTO_GHASH
-       tristate "GHASH digest algorithm"
+       tristate "GHASH hash function"
        select CRYPTO_GF128MUL
        select CRYPTO_HASH
        help
-         GHASH is message digest algorithm for GCM (Galois/Counter Mode).
+         GHASH is the hash function used in GCM (Galois/Counter Mode).
+         It is not a general-purpose cryptographic hash function.
 
 config CRYPTO_POLY1305
        tristate "Poly1305 authenticator algorithm"
@@ -929,9 +849,13 @@ config CRYPTO_SHA1_PPC_SPE
          SHA-1 secure hash standard (DFIPS 180-4) implemented
          using powerpc SPE SIMD instruction set.
 
+config CRYPTO_LIB_SHA256
+       tristate
+
 config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"
        select CRYPTO_HASH
+       select CRYPTO_LIB_SHA256
        help
          SHA256 secure hash standard (DFIPS 180-2).
 
@@ -1057,12 +981,12 @@ config CRYPTO_WP512
          <http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html>
 
 config CRYPTO_GHASH_CLMUL_NI_INTEL
-       tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
+       tristate "GHASH hash function (CLMUL-NI accelerated)"
        depends on X86 && 64BIT
        select CRYPTO_CRYPTD
        help
-         GHASH is message digest algorithm for GCM (Galois/Counter Mode).
-         The implementation is accelerated by CLMUL-NI of Intel.
+         This is the x86_64 CLMUL-NI accelerated implementation of
+         GHASH, the hash function used in GCM (Galois/Counter mode).
 
 comment "Ciphers"
 
@@ -1072,6 +996,7 @@ config CRYPTO_LIB_AES
 config CRYPTO_AES
        tristate "AES cipher algorithms"
        select CRYPTO_ALGAPI
+       select CRYPTO_LIB_AES
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael
          algorithm.
@@ -1385,9 +1310,13 @@ config CRYPTO_CAST6_AVX_X86_64
          This module provides the Cast6 cipher algorithm that processes
          eight blocks parallel using the AVX instruction set.
 
+config CRYPTO_LIB_DES
+       tristate
+
 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        select CRYPTO_ALGAPI
+       select CRYPTO_LIB_DES
        help
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
@@ -1395,7 +1324,7 @@ config CRYPTO_DES_SPARC64
        tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
        depends on SPARC64
        select CRYPTO_ALGAPI
-       select CRYPTO_DES
+       select CRYPTO_LIB_DES
        help
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
          optimized using SPARC64 crypto opcodes.
@@ -1404,7 +1333,7 @@ config CRYPTO_DES3_EDE_X86_64
        tristate "Triple DES EDE cipher algorithm (x86-64)"
        depends on X86 && 64BIT
        select CRYPTO_BLKCIPHER
-       select CRYPTO_DES
+       select CRYPTO_LIB_DES
        help
          Triple DES EDE (FIPS 46-3) algorithm.