From: Vladis Dronov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1879
``` Several CentOS 9 Stream Bugzillas have updated certain crypto configs. Forwart-port the same change to ARK, so these configs are consistent after a later branching.
An ARK build with these configs is green and a kernel boots in regular and FIPS modes.
Signed-off-by: Vladis Dronov vdronov@redhat.com ```
--- redhat/configs/ark/generic/arm/aarch64/CONFIG_CRYPTO_ECDH | 1 - redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA | 1 - redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_ECDH | 1 - redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA512_S390 => redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_SHA512_S390 | 0 redhat/configs/ark/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 | 1 + redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_USER => redhat/configs/ark/generic/CONFIG_CRYPTO_USER | 0 redhat/configs/common/generic/CONFIG_CRYPTO_ECDH | 2 +- redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA | 2 +- redhat/configs/common/generic/s390x/CONFIG_CRYPTO_SHA512_S390 => redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA512_S390 | 0 redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 => redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 | 0 redhat/configs/fedora/generic/CONFIG_CRYPTO_ECDSA | 1 - redhat/configs/common/generic/CONFIG_CRYPTO_USER => redhat/configs/fedora/generic/CONFIG_CRYPTO_USER | 0 12 files changed, 3 insertions(+), 6 deletions(-)
From: Vladis Dronov vdronov@redhat.com
Brush up crypto ECDH and ECDSA configs
Apply the same change as for C9S, so these configs are consistent after a later branching. Fedora already has CRYPTO_ECDSA=y so just add complimentary CRYPTO_ECDH=y.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_ECDSA=y diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH @@ -1 +1 @@ -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA @@ -1 +1 @@ -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDSA=y diff --git a/redhat/configs/fedora/generic/CONFIG_CRYPTO_ECDSA b/redhat/configs/fedora/generic/CONFIG_CRYPTO_ECDSA deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_CRYPTO_ECDSA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_ECDSA=y
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1879
From: Vladis Dronov vdronov@redhat.com
Brush up crypto SHA512 and USER configs
Apply the same change as for C9S, so these configs are consistent after a later branching. Make them =y in ARK (and drop duplicate zfcpdump entries) the same way as in C9S, but leave them =m in Fedora.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_USER b/redhat/configs/ark/generic/CONFIG_CRYPTO_USER rename from redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_USER rename to redhat/configs/ark/generic/CONFIG_CRYPTO_USER index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_USER +++ b/redhat/configs/ark/generic/CONFIG_CRYPTO_USER diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA512_S390 b/redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_SHA512_S390 rename from redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA512_S390 rename to redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_SHA512_S390 index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA512_S390 +++ b/redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_SHA512_S390 diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 b/redhat/configs/ark/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 @@ -0,0 +1 @@ +CONFIG_CRYPTO_SHA512_SSSE3=y diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_USER b/redhat/configs/fedora/generic/CONFIG_CRYPTO_USER rename from redhat/configs/common/generic/CONFIG_CRYPTO_USER rename to redhat/configs/fedora/generic/CONFIG_CRYPTO_USER index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_USER +++ b/redhat/configs/fedora/generic/CONFIG_CRYPTO_USER diff --git a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_SHA512_S390 b/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA512_S390 rename from redhat/configs/common/generic/s390x/CONFIG_CRYPTO_SHA512_S390 rename to redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA512_S390 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_SHA512_S390 +++ b/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA512_S390 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 rename to redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 +++ b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1879
From: Vladis Dronov vdronov@redhat.com
Drop outdated CRYPTO_ECDH configs
There is no reason why CRYPTO_ECDH is disabled in aarch64 and s390x. These defaults were previously mass-imported from RHEL7 and RHEL-ALT.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CRYPTO_ECDH b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CRYPTO_ECDH deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CRYPTO_ECDH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_ECDH is not set diff --git a/redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_ECDH b/redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_ECDH deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/CONFIG_CRYPTO_ECDH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_ECDH is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1879
From: Vladis Dronov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1879#note_9920982...
Recording the build and Bugzillas mentioned in a description for posterity:
a build: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=45948522
bz1: https://bugzilla.redhat.com/show_bug.cgi?id=1947240 bz2: https://bugzilla.redhat.com/show_bug.cgi?id=2070624 bz3: https://bugzilla.redhat.com/show_bug.cgi?id=2096894
kernel@lists.fedoraproject.org
-
Vladis Dronov (via Email Bridge)