diff options
| author | Jeremy Cline <jcline@redhat.com> | 2018-08-01 10:02:26 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2018-08-01 10:31:02 -0400 |
| commit | a1853172d8d1b1555163cbec598d51a4ae9439fd (patch) | |
| tree | 4541118e7a19f6ecad3b5240b1c5f0998327833f | |
| parent | f16068badd7458c76d88b242fac7547cc058e7e2 (diff) | |
| download | kernel-a1853172d8d1b1555163cbec598d51a4ae9439fd.tar.gz kernel-a1853172d8d1b1555163cbec598d51a4ae9439fd.tar.xz kernel-a1853172d8d1b1555163cbec598d51a4ae9439fd.zip | |
Enable AEGIS and MORUS ciphers (rhbz 1610180)
30 files changed, 116 insertions, 107 deletions
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128 b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128 index d5748cf4c..3027ee213 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128 +++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128 @@ -1 +1 @@ -# CONFIG_CRYPTO_AEGIS128 is not set +CONFIG_CRYPTO_AEGIS128=m diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L index 0a4964df9..332f8d41c 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L +++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L @@ -1 +1 @@ -# CONFIG_CRYPTO_AEGIS128L is not set +CONFIG_CRYPTO_AEGIS128L=m diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 index 66f2a01bb..505f92cb2 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 +++ b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 @@ -1 +1 @@ -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 index 8cd802095..631ee59ba 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 +++ b/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 @@ -1 +1 @@ -# CONFIG_CRYPTO_MORUS1280 is not set +CONFIG_CRYPTO_MORUS1280=m diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 index 665cbdb41..774f20fc6 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 +++ b/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 @@ -1 +1 @@ -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m 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 new file mode 100644 index 000000000..21a9942c6 --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m 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 new file mode 100644 index 000000000..1be47e8bb --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m 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 new file mode 100644 index 000000000..847524120 --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2 new file mode 100644 index 000000000..8ae1a8885 --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_MORUS1280_AVX2=m diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2 new file mode 100644 index 000000000..786389934 --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_MORUS1280_SSE2=m diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2 new file mode 100644 index 000000000..07d98b3fd --- /dev/null +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_MORUS640_SSE2=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0c585e7d4..8d50feab7 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 5802d5cf5..f7f3920d8 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 9e832253f..d35012e30 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 f0b684a0c..4e79d04da 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 1a8ac0cae..cc4983f7c 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 c80c4393b..713ab8588 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 9a084c4eb..6c079adbf 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 5c0c3ce0e..266d52a29 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 ae96160c6..77c501de6 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 4abaa8d57..cad7efa29 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 b101d8582..51fddfd44 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 fb39a1db3..861cf4580 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 c0e1ad35e..d8e20472e 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 b72e87b7f..4c4a7c8d7 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 bed68fdd0..a21ad960c 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 23a2c2512..b3e8f2b55 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 is not set +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS128=m # CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set -# CONFIG_CRYPTO_AEGIS256 is not set +CONFIG_CRYPTO_AEGIS256=m 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 is not set +CONFIG_CRYPTO_MORUS1280=m # CONFIG_CRYPTO_MORUS1280_SSE2 is not set -# CONFIG_CRYPTO_MORUS640 is not set +CONFIG_CRYPTO_MORUS640=m # 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 cf64b227f..9b17f48ed 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 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_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_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 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_MORUS1280_AVX2=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_MORUS1280_SSE2=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS640_SSE2=m 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 29928b09f..b25c94b76 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 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_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_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 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_MORUS1280_AVX2=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_MORUS1280_SSE2=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS640_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m diff --git a/kernel.spec b/kernel.spec index ac7e9569a..07753f26f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1904,6 +1904,9 @@ fi # # %changelog +* Wed Aug 01 2018 Jeremy Cline <jeremy@jcline.org> +- Enable AEGIS and MORUS ciphers (rhbz 1610180) + * Tue Jul 31 2018 Peter Robinson <pbrobinson@fedoraproject.org> - Add two bcm283x vc4 stability patches - Some AllWinner MMC driver fixes |