From bee753f32fa55c2359ebf6d3d3f602a38a7f949b Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Mon, 29 Jan 2024 12:54:26 +0300 Subject: [PATCH] Added support GOST and PAM-GOST profiles for crypto-policies in the UI interface --- ...ST-and-PAM-GOST-profiles-for-crypto-.patch | 61 +++++++++++++++++++ SPECS/cockpit.spec | 6 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch diff --git a/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch b/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch new file mode 100644 index 0000000..2b79cdc --- /dev/null +++ b/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch @@ -0,0 +1,61 @@ +From 6a449e397af96aa5629e067a3f0a3580e9399581 Mon Sep 17 00:00:00 2001 +From: Alexey Berezhok +Date: Mon, 29 Jan 2024 12:09:29 +0300 +Subject: [PATCH] Added support GOST and PAM-GOST profiles for crypto-policies + in the UI interface + +--- + pkg/systemd/overview-cards/cryptoPolicies.jsx | 5 +++++ + po/ru.po | 20 +++++++++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/pkg/systemd/overview-cards/cryptoPolicies.jsx b/pkg/systemd/overview-cards/cryptoPolicies.jsx +index 0b07c6f..27cf8be 100644 +--- a/pkg/systemd/overview-cards/cryptoPolicies.jsx ++++ b/pkg/systemd/overview-cards/cryptoPolicies.jsx +@@ -121,6 +121,11 @@ const CryptoPolicyDialog = ({ + ), + "FIPS:OSPP": _("FIPS with further Common Criteria restrictions."), + FUTURE: _("Protects from anticipated near-term future attacks at the expense of interoperability."), ++ "DEFAULT:GOST": _("DEFAULT with GOST algorithms enabled."), ++ "DEFAULT:PAM-GOST": _("DEFAULT with GOST password hashing."), ++ "DEFAULT:GOST:PAM-GOST": _("DEFAULT with GOST and GOST password hashing."), ++ "GOST-ONLY": _("GOST algorithms allowed only."), ++ "GOST-ONLY-PAM": _("GOST algorithms allowed only with GOST pass hashing."), + }; + + const policies = Object.keys(cryptopolicies) +diff --git a/po/ru.po b/po/ru.po +index 41b461f..d1c4748 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -2260,6 +2260,26 @@ msgstr "Настраиваемые зоны" + msgid "DEFAULT with SHA-1 signature verification allowed." + msgstr "" + ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:124 ++msgid "DEFAULT with GOST algorithms enabled." ++msgstr "Профиль по умолчанию, с добавлением поддержки ГОСТ алгоритмов" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:125 ++msgid "DEFAULT with GOST password hashing." ++msgstr "Профиль по умолчанию, с добавленим поддержки хэшей паролей по ГОСТ 34.11-2012" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:126 ++msgid "DEFAULT with GOST and GOST password hashing." ++msgstr "Профиль по умолчанию, с добавленим поддержки ГОСТ и хэшей паролей по ГОСТ 34.11-2012" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:127 ++msgid "GOST algorithms allowed only." ++msgstr "Профиль ГОСТ с запретом всего остального" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:128 ++msgid "GOST algorithms allowed only with GOST pass hashing." ++msgstr "Профиль ГОСТ(+хэш паролей по ГОСТ 34.11-2012) с запретом всего остального" ++ + #: pkg/networkmanager/ip-settings.jsx:223 + msgid "DNS" + msgstr "DNS" +-- +2.43.0 + diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index c62e430..94220ab 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -50,7 +50,7 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ Version: 300.3 -Release: 2%{?dist}.inferit +Release: 2%{?dist}.inferit.1 # We need to patch official source (000* patches in SOURCE) and # repack tarball to recompile javascript. # Use script cockpit-inferit-patch.sh to create @@ -64,6 +64,7 @@ Patch2: 0003-Show-MSVSPHERE_PRETTY_NAME-instead-of-NAME-for-docum.patch Patch3: 0004-Include-pkg-shell-module-translations-in-other-modul.patch Patch4: 0005-Show-MSVSPHERE_PRETTY_NAME-instead-of-PRETTY_NAME-in.patch Patch5: 0006-Disable-upstream-documentation-links.patch +Patch6: 0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch %if 0%{?fedora} >= 38 || 0%{?rhel} >= 9 %define cockpit_enable_python 1 @@ -794,6 +795,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Mon Jan 29 2024 Alexey Berezhok - 300.3-2.inferit.1 +- Added support GOST and PAM-GOST profiles for crypto-policies in the UI interface + * Thu Dec 14 2023 Arkady L. Shane - 300.3-2.inferit - Added Patches and script to create tarball