From 82e2306b4c6bc58b3fbeb3537c99d2aecef848d2 Mon Sep 17 00:00:00 2001 From: Jan Pokorny Date: Fri, 1 Nov 2024 12:14:58 +0100 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-8029 --- 0030-mod_pass_in_stratis_test.patch | 32 +++++++++++++++++++++++++++++ python-blivet.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0030-mod_pass_in_stratis_test.patch diff --git a/0030-mod_pass_in_stratis_test.patch b/0030-mod_pass_in_stratis_test.patch new file mode 100644 index 0000000..67bb1c0 --- /dev/null +++ b/0030-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 1d05fac..4dfc239 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.6.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 20%{?prerelease}%{?dist} +Release: 21%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ %global realname blivet @@ -59,6 +59,7 @@ Patch25: 0026-XFS-resize-test-fix.patch Patch26: 0027-RHEL96-bugfixes-1.patch Patch27: 0028-Fix-checking-for-NVMe-plugin-availability.patch Patch28: 0029-Align-sizes-up-for-growable-LVs.patch +Patch29: 0030-mod_pass_in_stratis_test.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -222,6 +223,11 @@ configuration. %endif %changelog + +* Fri Nov 1 2024 Jan Pokorny - 3.6.0-21 +- Modified passphrase in stratis test + Resolves: RHEL-8029 + * Thu Oct 24 2024 Vojtech Trefny - 3.6.0-20 - Align sizes up for growable LVs Resolves: RHEL-8036