[openwrt/openwrt] kernel: remove CRYPTO_BLAKE2S from all >=5.15

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 8 07:54:37 PDT 2023 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c170fc78ba6e4477cc06b2b77e11747da862dcf0

commit c170fc78ba6e4477cc06b2b77e11747da862dcf0
Author: Christian Svensson <blue at cmd.nu>
AuthorDate: Sat Jul 8 00:23:28 2023 +0200

    kernel: remove CRYPTO_BLAKE2S from all >=5.15
    
    This option was removed from upstream kernel back in 2022.
    See commits:
     2d16803c562ecc644803d42ba98a8e0aef9c014e (>=6.0)
     3dd33a09f5dc12ccb0902923c4c784eb0f8c7554 (>=5.15.61 backport)
    
    Signed-off-by: Christian Svensson <blue at cmd.nu>
---
 target/linux/armsr/armv8/config-6.1      | 1 -
 target/linux/ath79/config-5.15           | 1 -
 target/linux/bcm63xx/config-5.15         | 1 -
 target/linux/generic/config-5.15         | 1 -
 target/linux/generic/config-6.1          | 1 -
 target/linux/lantiq/config-5.15          | 1 -
 target/linux/malta/config-5.15           | 1 -
 target/linux/malta/config-6.1            | 1 -
 target/linux/mediatek/mt7622/config-5.15 | 1 -
 target/linux/octeon/config-5.15          | 1 -
 target/linux/sunxi/cortexa53/config-5.15 | 1 -
 target/linux/uml/config-5.15             | 1 -
 target/linux/x86/generic/config-5.15     | 1 -
 target/linux/x86/geode/config-5.15       | 1 -
 target/linux/x86/legacy/config-5.15      | 1 -
 15 files changed, 15 deletions(-)

diff --git a/target/linux/armsr/armv8/config-6.1 b/target/linux/armsr/armv8/config-6.1
index f6bcce191f..5bdda2d517 100644
--- a/target/linux/armsr/armv8/config-6.1
+++ b/target/linux/armsr/armv8/config-6.1
@@ -114,7 +114,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CHACHA20=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_CRYPTO_CRYPTD=y
diff --git a/target/linux/ath79/config-5.15 b/target/linux/ath79/config-5.15
index ce987c5539..21fd091a2e 100644
--- a/target/linux/ath79/config-5.15
+++ b/target/linux/ath79/config-5.15
@@ -34,7 +34,6 @@ CONFIG_CPU_R4K_CACHE_TLB=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CPU_SUPPORTS_MSA=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_RNG2=y
diff --git a/target/linux/bcm63xx/config-5.15 b/target/linux/bcm63xx/config-5.15
index c946302d31..f19d45362e 100644
--- a/target/linux/bcm63xx/config-5.15
+++ b/target/linux/bcm63xx/config-5.15
@@ -57,7 +57,6 @@ CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_CPUFREQ=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRASH_CORE=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_RNG2=y
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index a2770f2d5f..d7e4742d63 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -1087,7 +1087,6 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2B_NEON is not set
-# CONFIG_CRYPTO_BLAKE2S is not set
 # CONFIG_CRYPTO_BLAKE2S_ARM is not set
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
index 6a3ed63f56..8ba82f4222 100644
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@@ -1145,7 +1145,6 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2B_NEON is not set
-# CONFIG_CRYPTO_BLAKE2S is not set
 # CONFIG_CRYPTO_BLAKE2S_ARM is not set
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/target/linux/lantiq/config-5.15 b/target/linux/lantiq/config-5.15
index c37a543e1e..90d48fff04 100644
--- a/target/linux/lantiq/config-5.15
+++ b/target/linux/lantiq/config-5.15
@@ -37,7 +37,6 @@ CONFIG_CPU_R4K_CACHE_TLB=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CPU_SUPPORTS_MSA=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_RNG2=y
diff --git a/target/linux/malta/config-5.15 b/target/linux/malta/config-5.15
index f1ef5e8dfb..bbedaf5633 100644
--- a/target/linux/malta/config-5.15
+++ b/target/linux/malta/config-5.15
@@ -57,7 +57,6 @@ CONFIG_CPU_RMAP=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
diff --git a/target/linux/malta/config-6.1 b/target/linux/malta/config-6.1
index 8ab648069d..9ce439ee38 100644
--- a/target/linux/malta/config-6.1
+++ b/target/linux/malta/config-6.1
@@ -58,7 +58,6 @@ CONFIG_CPU_RMAP=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
diff --git a/target/linux/mediatek/mt7622/config-5.15 b/target/linux/mediatek/mt7622/config-5.15
index 30a5ff948f..643eaa45b6 100644
--- a/target/linux/mediatek/mt7622/config-5.15
+++ b/target/linux/mediatek/mt7622/config-5.15
@@ -111,7 +111,6 @@ CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
diff --git a/target/linux/octeon/config-5.15 b/target/linux/octeon/config-5.15
index 5882c7dd75..cf64ae34f9 100644
--- a/target/linux/octeon/config-5.15
+++ b/target/linux/octeon/config-5.15
@@ -44,7 +44,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CPU_SUPPORTS_HUGEPAGES=y
 CONFIG_CRAMFS=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
diff --git a/target/linux/sunxi/cortexa53/config-5.15 b/target/linux/sunxi/cortexa53/config-5.15
index 85ace5d928..93d5b2b21c 100644
--- a/target/linux/sunxi/cortexa53/config-5.15
+++ b/target/linux/sunxi/cortexa53/config-5.15
@@ -28,7 +28,6 @@ CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
diff --git a/target/linux/uml/config-5.15 b/target/linux/uml/config-5.15
index 549a31e1c6..ac13cda703 100644
--- a/target/linux/uml/config-5.15
+++ b/target/linux/uml/config-5.15
@@ -20,7 +20,6 @@ CONFIG_CPU_SUP_HYGON=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15
index 5fda82dd29..29c1e43b22 100644
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@@ -61,7 +61,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_RMAP=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_CS89x0_ISA is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
diff --git a/target/linux/x86/geode/config-5.15 b/target/linux/x86/geode/config-5.15
index 2ede23ea5e..0104b1e7b3 100644
--- a/target/linux/x86/geode/config-5.15
+++ b/target/linux/x86/geode/config-5.15
@@ -37,7 +37,6 @@ CONFIG_ALIX=y
 # CONFIG_AMD_PMC is not set
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 # CONFIG_ATA_PIIX is not set
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CS5535_CLOCK_EVENT_SRC=y
 CONFIG_CS5535_MFGPT=y
diff --git a/target/linux/x86/legacy/config-5.15 b/target/linux/x86/legacy/config-5.15
index a75ce40ab4..d6802d6c99 100644
--- a/target/linux/x86/legacy/config-5.15
+++ b/target/linux/x86/legacy/config-5.15
@@ -45,7 +45,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CDROM=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_CS89x0_ISA is not set
 CONFIG_DMA_ACPI=y

More information about the lede-commits mailing list