Merge pull request #1434 from tlaurion/non-intel_readd-AES-for-cryptsetup

tlaurion · web-flow · commit 3747d58510c7 · 2023-07-06T16:00:00.000-04:00
Non-Intel linux configs: make sure AES is enabled (CONFIG_CRYPTO_AES_NI_INTEL won't work there)
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -2683,8 +2683,6 @@ CONFIG_CRYPTO_NULL2=y`
`2683`	`2683`	`CONFIG_CRYPTO_CRYPTD=y`
`2684`	`2684`	`CONFIG_CRYPTO_AUTHENC=y`
`2685`	`2685`	`# CONFIG_CRYPTO_TEST is not set`
`2686`		`-CONFIG_CRYPTO_SIMD=y`
`2687`		`-CONFIG_CRYPTO_GLUE_HELPER_X86=y`
`2688`	`2686`
`2689`	`2687`	`#`
`2690`	`2688`	`# Public-key cryptography`
`@@ -2772,9 +2770,9 @@ CONFIG_CRYPTO_SHA512=y`
`2772`	`2770`	`#`
`2773`	`2771`	`# Ciphers`
`2774`	`2772`	`#`
`2775`		`-# CONFIG_CRYPTO_AES is not set`
	`2773`	`+CONFIG_CRYPTO_AES=y`
`2776`	`2774`	`# CONFIG_CRYPTO_AES_TI is not set`
`2777`		`-CONFIG_CRYPTO_AES_NI_INTEL=y`
	`2775`	`+# CONFIG_CRYPTO_AES_NI_INTEL is not set`
`2778`	`2776`	`# CONFIG_CRYPTO_BLOWFISH is not set`
`2779`	`2777`	`# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set`
`2780`	`2778`	`# CONFIG_CRYPTO_CAMELLIA is not set`
Original file line number	Diff line number	Diff line change
`@@ -2931,8 +2931,6 @@ CONFIG_CRYPTO_NULL2=y`
`2931`	`2931`	`CONFIG_CRYPTO_CRYPTD=y`
`2932`	`2932`	`CONFIG_CRYPTO_AUTHENC=y`
`2933`	`2933`	`# CONFIG_CRYPTO_TEST is not set`
`2934`		`-CONFIG_CRYPTO_SIMD=y`
`2935`		`-CONFIG_CRYPTO_GLUE_HELPER_X86=y`
`2936`	`2934`
`2937`	`2935`	`#`
`2938`	`2936`	`# Public-key cryptography`
`@@ -3020,9 +3018,9 @@ CONFIG_CRYPTO_SHA512=y`
`3020`	`3018`	`#`
`3021`	`3019`	`# Ciphers`
`3022`	`3020`	`#`
`3023`		`-# CONFIG_CRYPTO_AES is not set`
	`3021`	`+CONFIG_CRYPTO_AES=y`
`3024`	`3022`	`# CONFIG_CRYPTO_AES_TI is not set`
`3025`		`-CONFIG_CRYPTO_AES_NI_INTEL=y`
	`3023`	`+# CONFIG_CRYPTO_AES_NI_INTEL is not set`
`3026`	`3024`	`# CONFIG_CRYPTO_BLOWFISH is not set`
`3027`	`3025`	`# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set`
`3028`	`3026`	`# CONFIG_CRYPTO_CAMELLIA is not set`
Original file line number	Diff line number	Diff line change
`@@ -2827,7 +2827,7 @@ CONFIG_CRYPTO_SHA512=y`
`2827`	`2827`	`#`
`2828`	`2828`	`# Ciphers`
`2829`	`2829`	`#`
`2830`		`-# CONFIG_CRYPTO_AES is not set`
	`2830`	`+CONFIG_CRYPTO_AES=y`
`2831`	`2831`	`# CONFIG_CRYPTO_AES_TI is not set`
`2832`	`2832`	`CONFIG_CRYPTO_AES_NI_INTEL=y`
`2833`	`2833`	`# CONFIG_CRYPTO_BLOWFISH is not set`