kernel: enable CRYPTO_RNG2 and CRYPTO_SIG2 by default

These two symbols are selected by CONFIG_CRYPTO_MANAGER2[1-2], which
was already enabled on generic config-{6.12,6.18}.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=fb28fabfad332a731423ffdd2be122b73ea90f1e
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=6cb8815f41a966b217c0d9826c592254d72dcc31
Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/22730
Signed-off-by: Hauke Mehrtens <[email protected]>

target/linux/airoha/an7581/config-6.12

@@ -102,7 +102,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y

target/linux/airoha/an7583/config-6.12

@@ -101,7 +101,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y

target/linux/apm821xx/config-6.12

@@ -55,7 +55,6 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA3=y
 CONFIG_DATA_SHIFT=12

target/linux/armsr/config-6.12

@@ -95,7 +95,6 @@ CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DMADEVICES=y

target/linux/at91/sama5/config-6.12

@@ -118,7 +118,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y

target/linux/at91/sama7/config-6.12

@@ -118,7 +118,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y

target/linux/bcm27xx/bcm2709/config-6.12

@@ -151,7 +151,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y

target/linux/bcm27xx/bcm2710/config-6.12

@@ -159,7 +159,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y

target/linux/bcm27xx/bcm2711/config-6.12

@@ -158,7 +158,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y

target/linux/bcm27xx/bcm2712/config-6.12

@@ -190,7 +190,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y

target/linux/d1/config-6.12

@@ -72,11 +72,9 @@ CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y

target/linux/gemini/config-6.12

@@ -105,13 +105,11 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_USER=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y

target/linux/generic/config-6.12

@@ -1221,6 +1221,7 @@ CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RNG is not set
+CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_RSA is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -1243,6 +1244,7 @@ CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA512_RISCV64 is not set
+CONFIG_CRYPTO_SIG2=y
 # CONFIG_CRYPTO_SIMD is not set
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y

target/linux/generic/config-6.18

@@ -1265,7 +1265,7 @@ CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_RNG2 is not set
+CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_RSA is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SELFTESTS is not set
@@ -1289,7 +1289,7 @@ CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA512_RISCV64 is not set
-# CONFIG_CRYPTO_SIG2 is not set
+CONFIG_CRYPTO_SIG2=y
 # CONFIG_CRYPTO_SIMD is not set
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y

target/linux/imx/config-6.12

@@ -139,7 +139,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SEQIV=y

target/linux/ipq40xx/config-6.12

@@ -127,7 +127,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y

target/linux/ipq806x/config-6.12

@@ -118,7 +118,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y

target/linux/layerscape/armv8_64b/config-6.12

@@ -213,7 +213,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA256_ARM64=y

target/linux/loongarch64/config-6.12

@@ -167,7 +167,6 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y

target/linux/mediatek/filogic/config-6.12

@@ -133,7 +133,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA256_ARM64=y

target/linux/mediatek/mt7622/config-6.12

@@ -142,7 +142,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA256_ARM64=y

target/linux/mediatek/mt7623/config-6.12

@@ -114,7 +114,6 @@ CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y

target/linux/microchipsw/lan969x/config-6.18

@@ -70,8 +70,6 @@ CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_SHA256_ARCH=y
 CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DMADEVICES=y

target/linux/mpc85xx/config-6.12

@@ -52,7 +52,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 # CONFIG_CRYPTO_SHA1_PPC_SPE is not set

target/linux/omap/config-6.12

@@ -176,7 +176,6 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y
@@ -187,7 +186,6 @@ CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA512_ARM=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_CURRENT_POINTER_IN_TPIDRURO=y

target/linux/pistachio/config-6.12

@@ -73,7 +73,6 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_ZSTD=y

target/linux/qoriq/config-6.12

@@ -92,7 +92,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_XTS=y

target/linux/qualcommax/config-6.12

@@ -128,7 +128,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_XTS=y

target/linux/qualcommbe/config-6.12

@@ -128,7 +128,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_XTS=y

target/linux/realtek/rtl838x/config-6.18

@@ -50,8 +50,6 @@ CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NEED_SYNC=y

target/linux/realtek/rtl839x/config-6.18

@@ -53,8 +53,6 @@ CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NEED_SYNC=y

target/linux/realtek/rtl930x/config-6.18

@@ -40,8 +40,6 @@ CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NEED_SYNC=y

target/linux/realtek/rtl930x_nand/config-6.18

@@ -44,8 +44,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y

target/linux/realtek/rtl931x/config-6.18

@@ -43,8 +43,6 @@ CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NEED_SYNC=y

target/linux/realtek/rtl931x_nand/config-6.18

@@ -47,8 +47,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SECTION_MISMATCH=y

target/linux/sifiveu/config-6.12

@@ -75,7 +75,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SHA256=y

target/linux/starfive/config-6.12

@@ -106,7 +106,6 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SHA256=y

target/linux/sunxi/config-6.12

@@ -133,11 +133,9 @@ CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SIG2=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"

target/linux/tegra/config-6.12

@@ -137,7 +137,6 @@ CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SEQIV=y