dashboard/config/linux: move crypto configs into own fragment file

8 files changed, 128 insertions, 131 deletions

diff --git a/dashboard/config/linux/bits/arm.yml b/dashboard/config/linux/bits/arm.yml
index 145b0960c..e53da4dde 100644
--- a/dashboard/config/linux/bits/arm.yml
+++ b/dashboard/config/linux/bits/arm.yml
@@ -49,22 +49,4 @@ config:
  - BINFMT_ZFLAT
  - BINFMT_SHARED_FLAT
  - CAN_KVASER_PCIEFD: [-baseline, -onlyusb]
-
- - ARM_CRYPTO
- - CRYPTO_SHA1_ARM
- - CRYPTO_SHA256_ARM
- - CRYPTO_SHA512_ARM
- - CRYPTO_AES_ARM
- - CRYPTO_CHACHA20_NEON
- - CRYPTO_POLY1305_ARM
- - CRYPTO_SHA1_ARM_NEON
- - CRYPTO_SHA1_ARM_CE
- - CRYPTO_SHA2_ARM_CE
- - CRYPTO_AES_ARM_BS
- - CRYPTO_AES_ARM_CE
- - CRYPTO_GHASH_ARM_CE
- - CRYPTO_CRCT10DIF_ARM_CE
- - CRYPTO_CRC32_ARM_CE
- - CRYPTO_NHPOLY1305_NEON
- - CRYPTO_CURVE25519_NEON
  - CRC_T10DIF
diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml
new file mode 100644
index 000000000..96ddb2a49
--- /dev/null
+++ b/dashboard/config/linux/bits/crypto.yml
@@ -0,0 +1,122 @@
+# Copyright 2021 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+config:
+ - CRYPTO_USER
+ - CRYPTO_USER_API_ENABLE_OBSOLETE: [v5.10]
+ - CRYPTO_PCRYPT
+ - CRYPTO_ECRDSA
+ - CRYPTO_CURVE25519: [v5.6]
+ - CRYPTO_CHACHA20POLY1305
+ - CRYPTO_AEGIS128
+ - CRYPTO_CFB
+ - CRYPTO_LRW
+ - CRYPTO_OFB
+ - CRYPTO_KEYWRAP
+ - CRYPTO_ADIANTUM
+ - CRYPTO_XCBC
+ - CRYPTO_VMAC
+ - CRYPTO_BLAKE2S: [v5.6]
+ - CRYPTO_MICHAEL_MIC
+ - CRYPTO_RMD160
+ # Removed in b21b9a5e0aef "crypto: rmd128 - remove RIPE-MD 128 hash algorithm".
+ - CRYPTO_RMD128: [-v5.12]
+ - CRYPTO_RMD256: [-v5.12]
+ - CRYPTO_RMD320: [-v5.12]
+ - CRYPTO_TGR192: [-v5.12]
+ - CRYPTO_SALSA20: [-v5.12]
+ - CRYPTO_SHA3
+ - CRYPTO_SM3
+ - CRYPTO_WP512
+ - CRYPTO_AES_TI
+ - CRYPTO_ANUBIS
+ - CRYPTO_ARC4
+ - CRYPTO_BLOWFISH
+ - CRYPTO_CAMELLIA
+ - CRYPTO_DES
+ - CRYPTO_KHAZAD
+ - CRYPTO_SEED
+ - CRYPTO_SM4
+ - CRYPTO_TEA
+ - CRYPTO_TWOFISH
+ - CRYPTO_842
+ - CRYPTO_LZ4
+ - CRYPTO_LZ4HC
+ - CRYPTO_ANSI_CPRNG
+ - CRYPTO_DRBG_HASH
+ - CRYPTO_DRBG_CTR
+ - CRYPTO_USER_API_HASH
+ - CRYPTO_USER_API_SKCIPHER
+ - CRYPTO_USER_API_RNG
+ - CRYPTO_USER_API_AEAD
+ - CRYPTO_HW
+ - CRYPTO_DEV_VIRTIO
+ - CRYPTO_SM2: [v5.10]
+ - CRYPTO_DEV_CCP: [-arm, -riscv, -s390]
+ - CRYPTO_DEV_CCP_DD: [-arm, -riscv, -s390]
+ - CRYPTO_DEV_SP_CCP: n
+ - CRYPTO_DEV_SP_PSP: n
+
+ - CRYPTO_TWOFISH_AVX_X86_64: [x86_64]
+ - CRYPTO_BLOWFISH_X86_64: [x86_64]
+ - CRYPTO_CAMELLIA_AESNI_AVX2_X86_64: [x86_64]
+ - CRYPTO_CAST5_AVX_X86_64: [x86_64]
+ - CRYPTO_CAST6_AVX_X86_64: [x86_64]
+ - CRYPTO_DES3_EDE_X86_64: [x86_64]
+ - CRYPTO_SERPENT_SSE2_X86_64: [x86_64]
+ - CRYPTO_SERPENT_AVX2_X86_64: [x86_64]
+ - CRYPTO_AES_NI_INTEL: [x86_64]
+ - CRYPTO_GHASH_CLMUL_NI_INTEL: [x86_64]
+ - CRYPTO_AEGIS128_AESNI_SSE2: [x86_64]
+ - CRYPTO_NHPOLY1305_SSE2: [x86_64]
+ - CRYPTO_NHPOLY1305_AVX2: [x86_64]
+ - CRYPTO_CRC32C_INTEL: [x86_64]
+ - CRYPTO_CRC32_PCLMUL: [x86_64]
+ - CRYPTO_CRCT10DIF_PCLMUL: [x86_64]
+ - CRYPTO_SHA1_SSSE3: [x86_64]
+ - CRYPTO_SHA256_SSSE3: [x86_64]
+ - CRYPTO_SHA512_SSSE3: [x86_64]
+ - CRYPTO_DEV_PADLOCK: [x86_64]
+ - CRYPTO_DEV_PADLOCK_AES: [x86_64]
+ - CRYPTO_DEV_PADLOCK_SHA: [x86_64]
+ - CRYPTO_DEV_QAT_DH895xCC: [x86_64]
+ - CRYPTO_DEV_QAT_C3XXX: [x86_64]
+ - CRYPTO_DEV_QAT_C62X: [x86_64]
+ - CRYPTO_DEV_QAT_DH895xCCVF: [x86_64]
+ - CRYPTO_DEV_QAT_C3XXXVF: [x86_64]
+ - CRYPTO_DEV_QAT_C62XVF: [x86_64]
+
+ - ARM_CRYPTO: [arm]
+ - CRYPTO_SHA1_ARM: [arm]
+ - CRYPTO_SHA256_ARM: [arm]
+ - CRYPTO_SHA512_ARM: [arm]
+ - CRYPTO_AES_ARM: [arm]
+ - CRYPTO_CHACHA20_NEON: [arm, arm64]
+ - CRYPTO_POLY1305_ARM: [arm]
+ - CRYPTO_SHA1_ARM_NEON: [arm]
+ - CRYPTO_SHA1_ARM_CE: [arm]
+ - CRYPTO_SHA2_ARM_CE: [arm]
+ - CRYPTO_AES_ARM_BS: [arm]
+ - CRYPTO_AES_ARM_CE: [arm]
+ - CRYPTO_GHASH_ARM_CE: [arm]
+ - CRYPTO_CRCT10DIF_ARM_CE: [arm]
+ - CRYPTO_CRC32_ARM_CE: [arm]
+ - CRYPTO_NHPOLY1305_NEON: [arm, arm64]
+ - CRYPTO_CURVE25519_NEON: [arm]
+ - CRYPTO_SHA256_ARM64: [arm64]
+ - CRYPTO_SHA512_ARM64: [arm64]
+ - CRYPTO_SHA1_ARM64_CE: [arm64]
+ - CRYPTO_SHA2_ARM64_CE: [arm64]
+ - CRYPTO_SHA512_ARM64_CE: [arm64]
+ - CRYPTO_SHA3_ARM64: [arm64]
+ - CRYPTO_SM3_ARM64_CE: [arm64]
+ - CRYPTO_SM4_ARM64_CE: [arm64]
+ - CRYPTO_GHASH_ARM64_CE: [arm64]
+ - CRYPTO_CRCT10DIF_ARM64_CE: [arm64]
+ - CRYPTO_AES_ARM64: [arm64]
+ - CRYPTO_AES_ARM64_CE: [arm64]
+ - CRYPTO_AES_ARM64_CE_CCM: [arm64]
+ - CRYPTO_AES_ARM64_CE_BLK: [arm64]
+ - CRYPTO_AES_ARM64_NEON_BLK: [arm64]
+ - CRYPTO_POLY1305_NEON: [arm64]
+ - CRYPTO_AES_ARM64_BS: [arm64]
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 1dbee2407..6c92675b6 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -1037,88 +1037,6 @@ config:
  - BIG_KEYS
  - TRUSTED_KEYS
  - KEY_DH_OPERATIONS
- - CRYPTO_USER
- - CRYPTO_USER_API_ENABLE_OBSOLETE: [v5.10]
- - CRYPTO_PCRYPT
- - CRYPTO_ECRDSA
- - CRYPTO_CURVE25519: [v5.6]
- - CRYPTO_CHACHA20POLY1305
- - CRYPTO_AEGIS128
- - CRYPTO_AEGIS128_AESNI_SSE2: [x86_64]
- - CRYPTO_CFB
- - CRYPTO_LRW
- - CRYPTO_OFB
- - CRYPTO_KEYWRAP
- - CRYPTO_NHPOLY1305_SSE2: [x86_64]
- - CRYPTO_NHPOLY1305_AVX2: [x86_64]
- - CRYPTO_ADIANTUM
- - CRYPTO_XCBC
- - CRYPTO_VMAC
- - CRYPTO_CRC32C_INTEL: [x86_64]
- - CRYPTO_CRC32_PCLMUL: [x86_64]
- - CRYPTO_BLAKE2S: [v5.6]
- - CRYPTO_CRCT10DIF_PCLMUL: [x86_64]
- - CRYPTO_MICHAEL_MIC
- - CRYPTO_RMD160
- # Removed in b21b9a5e0aef "crypto: rmd128 - remove RIPE-MD 128 hash algorithm".
- - CRYPTO_RMD128: [-v5.12]
- - CRYPTO_RMD256: [-v5.12]
- - CRYPTO_RMD320: [-v5.12]
- - CRYPTO_TGR192: [-v5.12]
- - CRYPTO_SALSA20: [-v5.12]
- - CRYPTO_SHA1_SSSE3: [x86_64]
- - CRYPTO_SHA256_SSSE3: [x86_64]
- - CRYPTO_SHA512_SSSE3: [x86_64]
- - CRYPTO_SHA3
- - CRYPTO_SM3
- - CRYPTO_WP512
- - CRYPTO_GHASH_CLMUL_NI_INTEL: [x86_64]
- - CRYPTO_AES_TI
- - CRYPTO_AES_NI_INTEL: [x86_64]
- - CRYPTO_ANUBIS
- - CRYPTO_ARC4
- - CRYPTO_BLOWFISH
- - CRYPTO_BLOWFISH_X86_64: [x86_64]
- - CRYPTO_CAMELLIA
- - CRYPTO_CAMELLIA_AESNI_AVX2_X86_64: [x86_64]
- - CRYPTO_CAST5_AVX_X86_64: [x86_64]
- - CRYPTO_CAST6_AVX_X86_64: [x86_64]
- - CRYPTO_DES
- - CRYPTO_DES3_EDE_X86_64: [x86_64]
- - CRYPTO_KHAZAD
- - CRYPTO_SEED
- - CRYPTO_SERPENT_SSE2_X86_64: [x86_64]
- - CRYPTO_SERPENT_AVX2_X86_64: [x86_64]
- - CRYPTO_SM4
- - CRYPTO_TEA
- - CRYPTO_TWOFISH
- - CRYPTO_TWOFISH_AVX_X86_64: [x86_64]
- - CRYPTO_842
- - CRYPTO_LZ4
- - CRYPTO_LZ4HC
- - CRYPTO_ANSI_CPRNG
- - CRYPTO_DRBG_HASH
- - CRYPTO_DRBG_CTR
- - CRYPTO_USER_API_HASH
- - CRYPTO_USER_API_SKCIPHER
- - CRYPTO_USER_API_RNG
- - CRYPTO_USER_API_AEAD
- - CRYPTO_DEV_PADLOCK: [x86_64]
- - CRYPTO_DEV_PADLOCK_AES: [x86_64]
- - CRYPTO_DEV_PADLOCK_SHA: [x86_64]
- - CRYPTO_DEV_CCP: [-arm, -riscv, -s390]
- - CRYPTO_DEV_CCP_DD: [-arm, -riscv, -s390]
- - CRYPTO_DEV_SP_CCP: n
- - CRYPTO_DEV_SP_PSP: n
- - CRYPTO_DEV_QAT_DH895xCC: [x86_64]
- - CRYPTO_DEV_QAT_C3XXX: [x86_64]
- - CRYPTO_DEV_QAT_C62X: [x86_64]
- - CRYPTO_DEV_QAT_DH895xCCVF: [x86_64]
- - CRYPTO_DEV_QAT_C3XXXVF: [x86_64]
- - CRYPTO_DEV_QAT_C62XVF: [x86_64]
- - CRYPTO_HW
- - CRYPTO_DEV_VIRTIO
- - CRYPTO_SM2: [v5.10]
  - ASYMMETRIC_TPM_KEY_SUBTYPE
  - PKCS8_PRIVATE_KEY_PARSER
  - TPM_KEY_PARSER
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index e50ce7433..922fd8db6 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -35,6 +35,7 @@ includes:
  - s390.yml: [s390]
  - subsystems.yml: [-baseline, -onlyusb]
  - subsystems_net.yml: [-baseline, -onlyusb, -reduced]
+ - crypto.yml: [-baseline, -onlyusb]
  - bpf.yml: [-baseline, -onlyusb]
  - partitions.yml: [-baseline, -onlyusb, -reduced]
  - filesystems.yml: [-baseline, -onlyusb, -reduced]
diff --git a/dashboard/config/linux/upstream-arm-kasan-base.config b/dashboard/config/linux/upstream-arm-kasan-base.config
index d67518bf4..69419106f 100644
--- a/dashboard/config/linux/upstream-arm-kasan-base.config
+++ b/dashboard/config/linux/upstream-arm-kasan-base.config
@@ -566,25 +566,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # end of Tegra firmware driver
 # end of Firmware Drivers
 
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=y
-CONFIG_CRYPTO_SHA1_ARM_NEON=y
-CONFIG_CRYPTO_SHA1_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_CRYPTO_SHA256_ARM=y
-CONFIG_CRYPTO_SHA512_ARM=y
-# CONFIG_CRYPTO_BLAKE2S_ARM is not set
-# CONFIG_CRYPTO_BLAKE2B_NEON is not set
-CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_GHASH_ARM_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM_CE=y
-CONFIG_CRYPTO_CRC32_ARM_CE=y
-CONFIG_CRYPTO_CHACHA20_NEON=y
-CONFIG_CRYPTO_POLY1305_ARM=y
-CONFIG_CRYPTO_NHPOLY1305_NEON=y
-CONFIG_CRYPTO_CURVE25519_NEON=y
+# CONFIG_ARM_CRYPTO is not set
 CONFIG_AS_VFP_VMRS_FPINST=y
 
 #
@@ -3764,14 +3746,12 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
 # CONFIG_CRYPTO_NULL is not set
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
-CONFIG_CRYPTO_CRYPTD=y
+# CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
 
 #
 # Public-key cryptography
@@ -3806,7 +3786,6 @@ CONFIG_CRYPTO_CBC=y
 # CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_KEYWRAP is not set
-CONFIG_CRYPTO_NHPOLY1305=y
 # CONFIG_CRYPTO_ADIANTUM is not set
 # CONFIG_CRYPTO_ESSIV is not set
 
@@ -3884,14 +3863,9 @@ CONFIG_CRYPTO_HASH_INFO=y
 #
 CONFIG_CRYPTO_LIB_AES=y
 # CONFIG_CRYPTO_LIB_BLAKE2S is not set
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
 # CONFIG_CRYPTO_LIB_CHACHA is not set
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
 # CONFIG_CRYPTO_LIB_CURVE25519 is not set
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
 # CONFIG_CRYPTO_LIB_POLY1305 is not set
 # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
 CONFIG_CRYPTO_LIB_SHA256=y
diff --git a/dashboard/config/linux/upstream-arm-kasan.config b/dashboard/config/linux/upstream-arm-kasan.config
index 54e872926..b3e7c4d35 100644
--- a/dashboard/config/linux/upstream-arm-kasan.config
+++ b/dashboard/config/linux/upstream-arm-kasan.config
@@ -673,7 +673,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM_CE=y
 CONFIG_CRYPTO_CRC32_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_CRYPTO_POLY1305_ARM=y
-CONFIG_CRYPTO_NHPOLY1305_NEON=y
+# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
 CONFIG_CRYPTO_CURVE25519_NEON=y
 CONFIG_AS_VFP_VMRS_FPINST=y
 
diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config
index c78de8cdd..98efc4a34 100644
--- a/dashboard/config/linux/upstream-arm64-kasan.config
+++ b/dashboard/config/linux/upstream-arm64-kasan.config
@@ -713,7 +713,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=y
 CONFIG_CRYPTO_SM3_ARM64_CE=y
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+CONFIG_CRYPTO_SM4_ARM64_CE=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64=y
diff --git a/dashboard/config/linux/upstream-arm64-mte.config b/dashboard/config/linux/upstream-arm64-mte.config
index 160210d0b..3a1ccb383 100644
--- a/dashboard/config/linux/upstream-arm64-mte.config
+++ b/dashboard/config/linux/upstream-arm64-mte.config
@@ -710,7 +710,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=y
 CONFIG_CRYPTO_SM3_ARM64_CE=y
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+CONFIG_CRYPTO_SM4_ARM64_CE=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64=y