summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2018-08-01 16:35:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2018-08-01 16:35:31 -0500
commitb11fbf04e76ceb9aa09b16c2f937146b118d0a49 (patch)
treef7105b1f3756dc52cfec9efd4a093f01975b3127
parent7c800e431f5c61d4f8a283dc3840e6ebba9caf4b (diff)
downloadkernel-b11fbf04e76ceb9aa09b16c2f937146b118d0a49.tar.gz
kernel-b11fbf04e76ceb9aa09b16c2f937146b118d0a49.tar.xz
kernel-b11fbf04e76ceb9aa09b16c2f937146b118d0a49.zip
Back out AEGIS and MORUS ciphers (rhbz 1610180)
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_AEGIS1282
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L2
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_AEGIS2562
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_MORUS12802
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_MORUS6402
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE22
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE22
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE22
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX22
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE22
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE22
-rw-r--r--kernel-aarch64-debug.config10
-rw-r--r--kernel-aarch64.config10
-rw-r--r--kernel-armv7hl-debug.config10
-rw-r--r--kernel-armv7hl-lpae-debug.config10
-rw-r--r--kernel-armv7hl-lpae.config10
-rw-r--r--kernel-armv7hl.config10
-rw-r--r--kernel-i686-PAE.config10
-rw-r--r--kernel-i686-PAEdebug.config10
-rw-r--r--kernel-i686-debug.config10
-rw-r--r--kernel-i686.config10
-rw-r--r--kernel-ppc64-debug.config10
-rw-r--r--kernel-ppc64.config10
-rw-r--r--kernel-ppc64le-debug.config10
-rw-r--r--kernel-ppc64le.config10
-rw-r--r--kernel-s390x-debug.config10
-rw-r--r--kernel-s390x.config10
-rw-r--r--kernel-x86_64-debug.config22
-rw-r--r--kernel-x86_64.config22
29 files changed, 113 insertions, 113 deletions
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128 b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128
index 3027ee213..d5748cf4c 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128
+++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128 is not set
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L
index 332f8d41c..0a4964df9 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L
+++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS128L=m
+# CONFIG_CRYPTO_AEGIS128L is not set
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256
index 505f92cb2..66f2a01bb 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256
+++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280
index 631ee59ba..8cd802095 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280
+++ b/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280
@@ -1 +1 @@
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS640
index 774f20fc6..665cbdb41 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640
+++ b/configs/fedora/generic/CONFIG_CRYPTO_MORUS640
@@ -1 +1 @@
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
index 21a9942c6..a81dfddfc 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE2
index 1be47e8bb..7eb1a4c02 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE2
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
index 847524120..9728fabb3 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
@@ -1 +1 @@
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2
index 8ae1a8885..57f2ead2b 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2
@@ -1 +1 @@
-CONFIG_CRYPTO_MORUS1280_AVX2=m
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2
index 786389934..cbe300605 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2
@@ -1 +1 @@
-CONFIG_CRYPTO_MORUS1280_SSE2=m
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2
index 07d98b3fd..1d181d374 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2
@@ -1 +1 @@
-CONFIG_CRYPTO_MORUS640_SSE2=m
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8d50feab7..0c585e7d4 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1048,11 +1048,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
@@ -1138,9 +1138,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index f7f3920d8..5802d5cf5 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1047,11 +1047,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
@@ -1137,9 +1137,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d35012e30..9e832253f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1085,11 +1085,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM_BS=y
# CONFIG_CRYPTO_AES_ARM_CE is not set
CONFIG_CRYPTO_AES_ARM=y
@@ -1185,9 +1185,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4e79d04da..f0b684a0c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1051,11 +1051,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM_BS=y
# CONFIG_CRYPTO_AES_ARM_CE is not set
CONFIG_CRYPTO_AES_ARM=y
@@ -1131,9 +1131,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index cc4983f7c..1a8ac0cae 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1049,11 +1049,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM_BS=y
# CONFIG_CRYPTO_AES_ARM_CE is not set
CONFIG_CRYPTO_AES_ARM=y
@@ -1129,9 +1129,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 713ab8588..c80c4393b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1083,11 +1083,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_ARM_BS=y
# CONFIG_CRYPTO_AES_ARM_CE is not set
CONFIG_CRYPTO_AES_ARM=y
@@ -1183,9 +1183,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index fb32cb55d..9e96cd3ac 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -889,11 +889,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
@@ -971,9 +971,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d2ce44e1e..2b22355ec 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -893,11 +893,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
@@ -975,9 +975,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 3dc4b2a54..fd3786b0f 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -893,11 +893,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
@@ -975,9 +975,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-i686.config b/kernel-i686.config
index c712fbf04..670a960fb 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -889,11 +889,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
@@ -971,9 +971,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 51fddfd44..b101d8582 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -882,11 +882,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -957,9 +957,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 861cf4580..fb39a1db3 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -878,11 +878,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -953,9 +953,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index d8e20472e..c0e1ad35e 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -836,11 +836,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -911,9 +911,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 4c4a7c8d7..b72e87b7f 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -832,11 +832,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -907,9 +907,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 124a86dfd..c1d6380b3 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -837,11 +837,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_S390=m
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
@@ -906,9 +906,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PAES_S390=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 98406e3c9..61e9337ca 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -833,11 +833,11 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128L is not set
# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_S390=m
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES=y
@@ -902,9 +902,9 @@ CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-CONFIG_CRYPTO_MORUS1280=m
+# CONFIG_CRYPTO_MORUS1280 is not set
# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
-CONFIG_CRYPTO_MORUS640=m
+# CONFIG_CRYPTO_MORUS640 is not set
# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PAES_S390=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5deba0e95..b3bf89720 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -911,12 +911,12 @@ CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
-CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES_X86_64=y
@@ -1003,11 +1003,11 @@ CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280_AVX2=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS1280_SSE2=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS640_SSE2=m
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 08c2b1534..9dc79279a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -907,12 +907,12 @@ CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=y
-CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS256=m
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_AES_TI=m
CONFIG_CRYPTO_AES_X86_64=y
@@ -999,11 +999,11 @@ CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280_AVX2=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS1280_SSE2=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS640_SSE2=m
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m