kernel: Disable any unvetted ciphers/hashes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-aarch64-generic b/kernel/config-aarch64-generic
index 8a2c987f0afb5f88a87551b566506bd41422d456..fc88ff731bf9d58064708bed11ae80b9e45a1cf7 100644 (file)
--- a/kernel/config-aarch64-generic
+++ b/kernel/config-aarch64-generic
@@ -1639,7 +1639,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_NEON=m
+# CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 CONFIG_CRYPTO_AES_ARM64=m
@@ -1686,7 +1686,7 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_HISI_SEC=m
-CONFIG_CRYPTO_DEV_HISI_SEC2=m
+# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
 CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_HISI_HPRE=m

diff --git a/kernel/config-generic b/kernel/config-generic
index e18f363d0e1e2a1ec8d8955c096bcfde7beec92c..c7d2c6d53742a98c3b09fb98a72ef6023a918d73 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -6393,7 +6393,7 @@ CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=y
-CONFIG_CRYPTO_ECRDSA=m
+# CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography
@@ -6403,7 +6403,7 @@ CONFIG_CRYPTO_CURVE25519=m
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_ARIA=m
+# CONFIG_CRYPTO_ARIA is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -6413,8 +6413,7 @@ CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SM4_GENERIC=m
+# CONFIG_CRYPTO_SM4_GENERIC is not set
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 # end of Block ciphers
@@ -6428,7 +6427,7 @@ CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_HCTR2=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_LRW=m
@@ -6468,9 +6467,8 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM3_GENERIC=m
-CONFIG_CRYPTO_STREEBOG=m
+# CONFIG_CRYPTO_SM3_GENERIC is not set
+# CONFIG_CRYPTO_STREEBOG is not set
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
@@ -6547,7 +6545,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
 CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y

diff --git a/kernel/config-x86_64-generic b/kernel/config-x86_64-generic
index 37cec607b439fa1c7a77fe0c5abf4c9b4333914b..ce4239c352b33753d25f47b3b26cca0929cc8e11 100644 (file)
--- a/kernel/config-x86_64-generic
+++ b/kernel/config-x86_64-generic
@@ -1203,7 +1203,7 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64=m
+# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 # CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 19bd185def51f7be33476a461e47792e57cdb0bb..397a51c6c5e5b62bad60dc3af958b45fe362ddd7 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.1.4
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>