From 4f367d90e6a49f5ced60015bd61d4c8f867f8312 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Thu, 6 Jul 2023 11:06:27 -0400 Subject: [PATCH] Non-Intel linux configs: make sure AES is enabled (CONFIG_CRYPTO_AES_NI_INTEL won't work there) kgpe-d16 linux configs: disable CONFIG_CRYPTO_AES_NI_INTEL (not avail on AMD) This applied to Q35 qemu board which is AMD, not intel. generic AES needs to be enabled on non-intel boards, otherwise cryptsetup doesn't know how to deal with xts-plain Then saved back with linux.save_in_oldconfig_format_in_place --- config/linux-kgpe-d16_server-whiptail.config | 6 ++---- config/linux-kgpe-d16_server.config | 6 ++---- config/linux-kgpe-d16_workstation.config | 6 ++---- config/linux-qemu.config | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config index 02248a882..74d9f68bf 100644 --- a/config/linux-kgpe-d16_server-whiptail.config +++ b/config/linux-kgpe-d16_server-whiptail.config @@ -2683,8 +2683,6 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_AUTHENC=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Public-key cryptography @@ -2772,9 +2770,9 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_AES_NI_INTEL=y +# CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA is not set diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config index 02248a882..74d9f68bf 100644 --- a/config/linux-kgpe-d16_server.config +++ b/config/linux-kgpe-d16_server.config @@ -2683,8 +2683,6 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_AUTHENC=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Public-key cryptography @@ -2772,9 +2770,9 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_AES_NI_INTEL=y +# CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA is not set diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index 13397e9d2..3acfe760c 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -2931,8 +2931,6 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_AUTHENC=y # CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Public-key cryptography @@ -3020,9 +3018,9 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_AES_NI_INTEL=y +# CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA is not set diff --git a/config/linux-qemu.config b/config/linux-qemu.config index 5787f5689..adf3a40cd 100644 --- a/config/linux-qemu.config +++ b/config/linux-qemu.config @@ -2827,7 +2827,7 @@ CONFIG_CRYPTO_SHA512=y # # Ciphers # -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_AES_TI is not set CONFIG_CRYPTO_AES_NI_INTEL=y # CONFIG_CRYPTO_BLOWFISH is not set