diff --git a/openssl-adapt-tests-for-3.1.0.patch b/openssl-adapt-tests-for-3.1.0.patch new file mode 100644 index 0000000..f8e2bf5 --- /dev/null +++ b/openssl-adapt-tests-for-3.1.0.patch @@ -0,0 +1,22 @@ +From a72341e20fd781b59beb59a27b222d32d021076e Mon Sep 17 00:00:00 2001 +From: Otto Hollmann +Date: Thu, 16 Mar 2023 11:21:04 +0100 +Subject: [PATCH] Adapt tests for OpenSSL v3.1.0 + +--- + tests/test_ssl.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_ssl.py b/tests/test_ssl.py +index 6b9e1216..029e11ab 100644 +--- a/tests/test_ssl.py ++++ b/tests/test_ssl.py +@@ -411,6 +411,7 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase): + warnings.simplefilter('ignore', DeprecationWarning) + ctx = SSL.Context('tlsv1') + s = SSL.Connection(ctx) ++ s.set_cipher_list('DEFAULT:@SECLEVEL=0') + with six.assertRaisesRegex(self, SSL.SSLError, + r'version|unexpected eof'): + s.connect(self.srv_addr) +-- diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index f44fa7b..84e4556 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 16 10:35:33 UTC 2023 - Otto Hollmann + +- Adapt tests for OpenSSL v3.1.0 + * Add openssl-adapt-tests-for-3.1.0.patch + ------------------------------------------------------------------- Mon Nov 7 20:14:16 UTC 2022 - Dirk Müller diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 2b22852..0ee6c54 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -1,7 +1,7 @@ # # spec file for package python-M2Crypto # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ Patch0: CVE-2020-25657-Bleichenbacher-attack.patch Patch1: openssl-stop-parsing-header.patch # Patch-FIX-OPENSUSE add test skips for openssl 3.x Patch2: https://src.fedoraproject.org/rpms/m2crypto/raw/d7be0dd83ee5a414544d99dcc62cde4ad5998f0c/f/m2crypto-0.38-ossl3-tests.patch +# PATCH-FIX-UPSTREAM https://gitlab.com/m2crypto/m2crypto/-/merge_requests/284 +Patch3: openssl-adapt-tests-for-3.1.0.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module parameterized} BuildRequires: %{python_module pytest}