You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.6 KiB
43 lines
1.6 KiB
4 months ago
|
From 93759e2eedd282e57455735326d99b0dd3356a8a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
||
|
|
Date: Sat, 23 Dec 2023 12:20:03 +0100
|
||
|
|
Subject: [PATCH] ukify: make the test happy with the latest OpenSSL
|
||
|
|
|
||
|
|
Which dropped some whitespaces in the output:
|
||
|
|
|
||
|
|
$ openssl version
|
||
|
|
OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23 Nov 2023)
|
||
|
|
$ openssl x509 -in cert.pem -text -noout | grep Issuer
|
||
|
|
Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd
|
||
|
|
|
||
|
|
$ openssl version
|
||
|
|
OpenSSL 3.0.9 30 May 2023 (Library: OpenSSL 3.0.9 30 May 2023)
|
||
|
|
$ openssl x509 -in cert.pem -text -noout | grep Issuer
|
||
|
|
Issuer: C = XX, L = Default City, O = Default Company Ltd
|
||
|
|
|
||
|
|
Making test-ukify unhappy:
|
||
|
|
|
||
|
|
> assert 'Issuer: CN = SecureBoot signing key on host' in out
|
||
|
|
E AssertionError: assert 'Issuer: CN = SecureBoot signing key on host' in '<...snip...>Issuer: CN=SecureBoot signing key on host archlinux2\n...'
|
||
|
|
|
||
|
|
(cherry picked from commit 338ed5bea4fcd0b5b1cdcfb96a789edf6251bbdd)
|
||
|
|
|
||
|
|
Resolves: RHEL-34061
|
||
|
|
---
|
||
|
|
src/ukify/test/test_ukify.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py
|
||
|
|
index 5a42a94799..31054eabea 100755
|
||
|
|
--- a/src/ukify/test/test_ukify.py
|
||
|
|
+++ b/src/ukify/test/test_ukify.py
|
||
|
|
@@ -850,7 +850,7 @@ def test_key_cert_generation(tmpdir):
|
||
|
|
'-noout',
|
||
|
|
], text = True)
|
||
|
|
assert 'Certificate' in out
|
||
|
|
- assert 'Issuer: CN = SecureBoot signing key on host' in out
|
||
|
|
+ assert re.search('Issuer: CN\s?=\s?SecureBoot signing key on host', out)
|
||
|
|
|
||
|
|
if __name__ == '__main__':
|
||
|
|
sys.exit(pytest.main(sys.argv))
|