From d475d4c0b1f57a249bbe0e18bf85fbe30e42aac9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 13 Aug 2018 11:04:57 +0100 Subject: [PATCH] Disable speck crypto cipher The upstream maintainer is dropping it and due to ISO cert issues it's likely to be gone soon so better off not encouraging usage of it until the final decision is made. Details here https://lwn.net/Articles/761992/ --- configs/fedora/generic/CONFIG_CRYPTO_SPECK | 2 +- configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON | 2 +- kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 4 ++-- kernel-armv7hl-lpae-debug.config | 4 ++-- kernel-armv7hl-lpae.config | 4 ++-- kernel-armv7hl.config | 4 ++-- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 3 +++ 21 files changed, 29 insertions(+), 26 deletions(-) diff --git a/configs/fedora/generic/CONFIG_CRYPTO_SPECK b/configs/fedora/generic/CONFIG_CRYPTO_SPECK index 8c7e39b5a..d7df9f391 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_SPECK +++ b/configs/fedora/generic/CONFIG_CRYPTO_SPECK @@ -1 +1 @@ -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON b/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON index d6abed0e9..6e3e6dd69 100644 --- a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON @@ -1 +1 @@ -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK_NEON is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index e95986700..3980e5586 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1176,8 +1176,8 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4_ARM64_CE=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 7d2dc0a51..63be488f8 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1175,8 +1175,8 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4_ARM64_CE=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 4acdb1f13..a5cdbecb5 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1218,8 +1218,8 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 3d9711adc..0698736a6 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1164,8 +1164,8 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index edf99a84b..a300731a7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1162,8 +1162,8 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b4aa65102..6c5b78bfc 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1216,8 +1216,8 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_SPECK_NEON=m +# CONFIG_CRYPTO_SPECK is not set +# CONFIG_CRYPTO_SPECK_NEON is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 0834591e7..21da47b4a 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -997,7 +997,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index fab02ee69..5edc9265c 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1001,7 +1001,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 8ee08e686..664841322 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1001,7 +1001,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-i686.config b/kernel-i686.config index 8f387bbb1..b690f1e1c 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -997,7 +997,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 32835ba70..138e142df 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -983,7 +983,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index f162ac6df..45322c8c9 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -979,7 +979,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 8d5a8d6db..20354a942 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -937,7 +937,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 5b281a436..1ab561ec0 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -933,7 +933,7 @@ CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 4f8f333e2..8d7aea7fd 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -935,7 +935,7 @@ CONFIG_CRYPTO_SHA512_S390=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-s390x.config b/kernel-s390x.config index e68f395e5..c790a012f 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -931,7 +931,7 @@ CONFIG_CRYPTO_SHA512_S390=m CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index b8298162a..e3fc59be4 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1042,7 +1042,7 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SKEIN is not set CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index cf9c26888..1c7b0a091 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1038,7 +1038,7 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SKEIN is not set CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m diff --git a/kernel.spec b/kernel.spec index 6d8ecefa5..02b0233e2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1910,6 +1910,9 @@ fi # # %changelog +* Mon Aug 13 2018 Peter Robinson +- Disable speck crypto cipher + * Sat Aug 11 2018 Peter Robinson - Add ZYNQMP clock and firmware driver