Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 26 Dec 2022, at 20:29, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Backported from IPFire 3.x as 2487038703ad6509202ffc16804cd17755dd5ad5.
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> config/kernel/kernel.config.x86_64-ipfire | 41 ++++++++++++-----------
> 1 file changed, 21 insertions(+), 20 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index a3f97641a..085005dbc 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -6957,14 +6957,14 @@ CONFIG_CRYPTO_MANAGER2=y
> CONFIG_CRYPTO_USER=m
> # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
> # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
> -CONFIG_CRYPTO_GF128MUL=y
> +CONFIG_CRYPTO_GF128MUL=m
> CONFIG_CRYPTO_NULL=y
> CONFIG_CRYPTO_NULL2=y
> CONFIG_CRYPTO_PCRYPT=y
> CONFIG_CRYPTO_CRYPTD=y
> CONFIG_CRYPTO_AUTHENC=m
> -CONFIG_CRYPTO_TEST=m
> -CONFIG_CRYPTO_SIMD=y
> +# CONFIG_CRYPTO_TEST is not set
> +CONFIG_CRYPTO_SIMD=m
> CONFIG_CRYPTO_ENGINE=m
> 
> #
> @@ -6976,8 +6976,8 @@ CONFIG_CRYPTO_ECC=y
> CONFIG_CRYPTO_ECDH=m
> CONFIG_CRYPTO_ECDSA=y
> # CONFIG_CRYPTO_ECRDSA is not set
> -CONFIG_CRYPTO_SM2=m
> -# CONFIG_CRYPTO_CURVE25519 is not set
> +# CONFIG_CRYPTO_SM2 is not set
> +CONFIG_CRYPTO_CURVE25519=m
> CONFIG_CRYPTO_CURVE25519_X86=m
> 
> #
> @@ -6988,21 +6988,21 @@ CONFIG_CRYPTO_GCM=m
> CONFIG_CRYPTO_CHACHA20POLY1305=m
> # CONFIG_CRYPTO_AEGIS128 is not set
> # CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
> -CONFIG_CRYPTO_SEQIV=y
> +CONFIG_CRYPTO_SEQIV=m
> CONFIG_CRYPTO_ECHAINIV=m
> 
> #
> # Block modes
> #
> -CONFIG_CRYPTO_CBC=y
> +CONFIG_CRYPTO_CBC=m
> # CONFIG_CRYPTO_CFB is not set
> -CONFIG_CRYPTO_CTR=y
> +CONFIG_CRYPTO_CTR=m
> CONFIG_CRYPTO_CTS=m
> -CONFIG_CRYPTO_ECB=y
> -CONFIG_CRYPTO_LRW=y
> +CONFIG_CRYPTO_ECB=m
> +CONFIG_CRYPTO_LRW=m
> # CONFIG_CRYPTO_OFB is not set
> CONFIG_CRYPTO_PCBC=m
> -CONFIG_CRYPTO_XTS=y
> +CONFIG_CRYPTO_XTS=m
> CONFIG_CRYPTO_KEYWRAP=m
> # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
> # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
> @@ -7043,7 +7043,7 @@ CONFIG_CRYPTO_SHA512_SSSE3=m
> CONFIG_CRYPTO_SHA256=y
> CONFIG_CRYPTO_SHA512=y
> CONFIG_CRYPTO_SHA3=m
> -CONFIG_CRYPTO_SM3=m
> +# CONFIG_CRYPTO_SM3 is not set
> # CONFIG_CRYPTO_STREEBOG is not set
> CONFIG_CRYPTO_WP512=m
> CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
> @@ -7051,9 +7051,9 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
> #
> # Ciphers
> #
> -CONFIG_CRYPTO_AES=y
> +CONFIG_CRYPTO_AES=m
> CONFIG_CRYPTO_AES_TI=m
> -CONFIG_CRYPTO_AES_NI_INTEL=y
> +CONFIG_CRYPTO_AES_NI_INTEL=m
> CONFIG_CRYPTO_ANUBIS=m
> CONFIG_CRYPTO_ARC4=m
> CONFIG_CRYPTO_BLOWFISH=m
> @@ -7097,7 +7097,7 @@ CONFIG_CRYPTO_LZO=m
> # CONFIG_CRYPTO_842 is not set
> CONFIG_CRYPTO_LZ4=m
> CONFIG_CRYPTO_LZ4HC=m
> -# CONFIG_CRYPTO_ZSTD is not set
> +CONFIG_CRYPTO_ZSTD=m
> 
> #
> # Random Number Generation
> @@ -7122,8 +7122,9 @@ CONFIG_CRYPTO_HW=y
> CONFIG_CRYPTO_DEV_PADLOCK=m
> CONFIG_CRYPTO_DEV_PADLOCK_AES=m
> CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
> -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
> -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
> +CONFIG_CRYPTO_DEV_ATMEL_I2C=m
> +CONFIG_CRYPTO_DEV_ATMEL_ECC=m
> +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
> CONFIG_CRYPTO_DEV_CCP=y
> CONFIG_CRYPTO_DEV_CCP_DD=m
> CONFIG_CRYPTO_DEV_SP_CCP=y
> @@ -7142,8 +7143,8 @@ CONFIG_CRYPTO_DEV_NITROX=m
> CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
> CONFIG_CRYPTO_DEV_CHELSIO=m
> CONFIG_CRYPTO_DEV_VIRTIO=m
> -# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
> -# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
> +CONFIG_CRYPTO_DEV_SAFEXCEL=m
> +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
> CONFIG_ASYMMETRIC_KEY_TYPE=y
> CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
> CONFIG_X509_CERTIFICATE_PARSER=y
> @@ -7190,7 +7191,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
> #
> # Crypto library routines
> #
> -CONFIG_CRYPTO_LIB_AES=y
> +CONFIG_CRYPTO_LIB_AES=m
> CONFIG_CRYPTO_LIB_ARC4=m
> CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
> CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
> -- 
> 2.35.3