Merge tag 'vfio-v4.10-rc3' of git://github.com/awilliam/linux-vfio

[linux.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 84d71482bf080288d2c379b03dbb02894ba3b4c5..160f08e721cc05ee4e8b1b4d4ecb556c599d6c36 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -24,7 +24,7 @@ comment "Crypto core or helper"
 config CRYPTO_FIPS
        bool "FIPS 200 compliance"
        depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) && !CRYPTO_MANAGER_DISABLE_TESTS
-       depends on MODULE_SIG
+       depends on (MODULE_SIG || !MODULES)
        help
          This options enables the fips boot option which is
          required if you want to system to operate in a FIPS 200
@@ -102,6 +102,15 @@ config CRYPTO_KPP
        select CRYPTO_ALGAPI
        select CRYPTO_KPP2
 
+config CRYPTO_ACOMP2
+       tristate
+       select CRYPTO_ALGAPI2
+
+config CRYPTO_ACOMP
+       tristate
+       select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
+
 config CRYPTO_RSA
        tristate "RSA algorithm"
        select CRYPTO_AKCIPHER
@@ -138,6 +147,7 @@ config CRYPTO_MANAGER2
        select CRYPTO_BLKCIPHER2
        select CRYPTO_AKCIPHER2
        select CRYPTO_KPP2
+       select CRYPTO_ACOMP2
 
 config CRYPTO_USER
        tristate "Userspace cryptographic algorithm configuration"
@@ -236,10 +246,14 @@ config CRYPTO_ABLK_HELPER
        tristate
        select CRYPTO_CRYPTD
 
+config CRYPTO_SIMD
+       tristate
+       select CRYPTO_CRYPTD
+
 config CRYPTO_GLUE_HELPER_X86
        tristate
        depends on X86
-       select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
 
 config CRYPTO_ENGINE
        tristate
@@ -437,7 +451,7 @@ config CRYPTO_CRC32C_INTEL
          gain performance compared with software implementation.
          Module will be crc32c-intel.
 
-config CRYPT_CRC32C_VPMSUM
+config CRYPTO_CRC32C_VPMSUM
        tristate "CRC32c CRC algorithm (powerpc64)"
        depends on PPC64 && ALTIVEC
        select CRYPTO_HASH
@@ -928,14 +942,13 @@ config CRYPTO_AES_X86_64
 config CRYPTO_AES_NI_INTEL
        tristate "AES cipher algorithms (AES-NI)"
        depends on X86
+       select CRYPTO_AEAD
        select CRYPTO_AES_X86_64 if 64BIT
        select CRYPTO_AES_586 if !64BIT
-       select CRYPTO_CRYPTD
-       select CRYPTO_ABLK_HELPER
        select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
        select CRYPTO_GLUE_HELPER_X86 if 64BIT
-       select CRYPTO_LRW
-       select CRYPTO_XTS
+       select CRYPTO_SIMD
        help
          Use Intel AES-NI instructions for AES algorithm.
 
@@ -1568,6 +1581,7 @@ comment "Compression"
 config CRYPTO_DEFLATE
        tristate "Deflate compression algorithm"
        select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
        select ZLIB_INFLATE
        select ZLIB_DEFLATE
        help
@@ -1579,6 +1593,7 @@ config CRYPTO_DEFLATE
 config CRYPTO_LZO
        tristate "LZO compression algorithm"
        select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
        select LZO_COMPRESS
        select LZO_DECOMPRESS
        help
@@ -1587,6 +1602,7 @@ config CRYPTO_LZO
 config CRYPTO_842
        tristate "842 compression algorithm"
        select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
        select 842_COMPRESS
        select 842_DECOMPRESS
        help
@@ -1595,6 +1611,7 @@ config CRYPTO_842
 config CRYPTO_LZ4
        tristate "LZ4 compression algorithm"
        select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
        select LZ4_COMPRESS
        select LZ4_DECOMPRESS
        help
@@ -1603,6 +1620,7 @@ config CRYPTO_LZ4
 config CRYPTO_LZ4HC
        tristate "LZ4HC compression algorithm"
        select CRYPTO_ALGAPI
+       select CRYPTO_ACOMP2
        select LZ4HC_COMPRESS
        select LZ4_DECOMPRESS
        help