From 84e2f6f95a5b9a0db23c030a7ab7bc3628354f93 Mon Sep 17 00:00:00 2001 From: Jan Pokorny Date: Thu, 31 Oct 2024 12:52:32 +0100 Subject: [PATCH] Modified passphrase in stratis test Resolves: RHEL-45173 --- 0009-mod_pass_in_stratis_test.patch | 32 +++++++++++++++++++++++++++++ python-blivet.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0009-mod_pass_in_stratis_test.patch diff --git a/0009-mod_pass_in_stratis_test.patch b/0009-mod_pass_in_stratis_test.patch new file mode 100644 index 0000000..67bb1c0 --- /dev/null +++ b/0009-mod_pass_in_stratis_test.patch @@ -0,0 +1,32 @@ +From c2177aa362d20278a0ebd5c25a776f952d83e5b1 Mon Sep 17 00:00:00 2001 +From: Jan Pokorny +Date: Fri, 11 Oct 2024 17:17:41 +0200 +Subject: [PATCH] Modified passphrase in stratis test + +FIPS requires at least 8 chars long passphrase. Dummy passphrase used +in stratis test was too short causing encryption +tests with FIPS enabled to fail. + +Changed passphrase. + +fixes RHEL-45173, RHEL-8029 +--- + tests/storage_tests/devices_test/stratis_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/storage_tests/devices_test/stratis_test.py b/tests/storage_tests/devices_test/stratis_test.py +index 5aaa12d4..21c4d0f5 100644 +--- a/tests/storage_tests/devices_test/stratis_test.py ++++ b/tests/storage_tests/devices_test/stratis_test.py +@@ -230,7 +230,7 @@ class StratisTestCaseClevis(StratisTestCaseBase): + blivet.partitioning.do_partitioning(self.storage) + + pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd], +- encrypted=True, passphrase="abcde", ++ encrypted=True, passphrase="fipsneeds8chars", + clevis=StratisClevisConfig(pin="tang", + tang_url=self._tang_server, + tang_thumbprint=None)) +-- +2.45.0 + diff --git a/python-blivet.spec b/python-blivet.spec index 8af0076..521f648 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -5,7 +5,7 @@ Version: 3.10.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 10%{?prerelease}%{?dist} +Release: 11%{?prerelease}%{?dist} Epoch: 1 License: LGPL-2.1-or-later %global realname blivet @@ -24,6 +24,7 @@ Patch4: 0005-consolidated-s390-device-configuration.patch Patch5: 0006-Remove-support-for-the-MD-linear-RAID-level.patch Patch6: 0007-Fix-checking-for-NVMe-plugin-availability.patch Patch7: 0008-Align-sizes-up-for-growable-LVs.patch +Patch8: 0009-mod_pass_in_stratis_test.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -118,6 +119,10 @@ make DESTDIR=%{buildroot} install %{python3_sitelib}/* %changelog +* Fri Nov 1 2024 Jan Pokorny - 3.10.0-11 +- Modified passphrase in stratis test + Resolves: RHEL-45173 + * Tue Oct 29 2024 Troy Dawson - 1:3.10.0-10 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018