From e5885dda7c16116e4d015d6b87c7c4b9450c6fcc Mon Sep 17 00:00:00 2001 From: liningjie Date: Mon, 4 Dec 2023 14:08:08 +0800 Subject: [PATCH] backport patches from openEuler-22.03-LTS-SP1 --- ...a-PKCS-7-bundle-with-no-certificates.patch | 49 +++++++++++++ ...an-empty-list-for-pkcs7-cert-loading.patch | 70 +++++++++++++++++++ python-cryptography.spec | 11 ++- 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch create mode 100644 backport-raise-an-exception-instead-of-returning-an-empty-list-for-pkcs7-cert-loading.patch diff --git a/backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch b/backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch new file mode 100644 index 0000000..acfdcb7 --- /dev/null +++ b/backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch @@ -0,0 +1,49 @@ +From a739c81fed3f87effec5bc78400658b666568a3a Mon Sep 17 00:00:00 2001 +From: Alex Gaynor +Date: Wed, 29 Nov 2023 10:05:44 +0800 +Subject: [PATCH] Fixed crash when loading a PKCS#7 bundle with no certificates + (#9926) + +--- + src/cryptography/hazmat/backends/openssl/backend.py | 5 ++++- + tests/hazmat/primitives/test_pkcs7.py | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py +index 7364523..1a1a6d1 100644 +--- a/src/cryptography/hazmat/backends/openssl/backend.py ++++ b/src/cryptography/hazmat/backends/openssl/backend.py +@@ -2189,9 +2189,12 @@ class Backend(BackendInterface): + _Reasons.UNSUPPORTED_SERIALIZATION, + ) + ++ certs: list[x509.Certificate] = [] ++ if p7.d.sign == self._ffi.NULL: ++ return certs ++ + sk_x509 = p7.d.sign.cert + num = self._lib.sk_X509_num(sk_x509) +- certs = [] + for i in range(num): + x509 = self._lib.sk_X509_value(sk_x509, i) + self.openssl_assert(x509 != self._ffi.NULL) +diff --git a/tests/hazmat/primitives/test_pkcs7.py b/tests/hazmat/primitives/test_pkcs7.py +index 91ac842..e6dcd8e 100644 +--- a/tests/hazmat/primitives/test_pkcs7.py ++++ b/tests/hazmat/primitives/test_pkcs7.py +@@ -81,6 +81,12 @@ class TestPKCS7Loading(object): + mode="rb", + ) + ++ def test_load_pkcs7_empty_certificates(self, backend): ++ der = b"\x30\x0B\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x07\x02" ++ ++ certificates = pkcs7.load_der_pkcs7_certificates(der) ++ assert certificates == [] ++ + + # We have no public verification API and won't be adding one until we get + # some requirements from users so this function exists to give us basic +-- +2.33.0 + diff --git a/backport-raise-an-exception-instead-of-returning-an-empty-list-for-pkcs7-cert-loading.patch b/backport-raise-an-exception-instead-of-returning-an-empty-list-for-pkcs7-cert-loading.patch new file mode 100644 index 0000000..03bd796 --- /dev/null +++ b/backport-raise-an-exception-instead-of-returning-an-empty-list-for-pkcs7-cert-loading.patch @@ -0,0 +1,70 @@ +From e42162a7f730481642bb063cf72274d002dc8c0b Mon Sep 17 00:00:00 2001 +From: Paul Kehrer +Date: Sun, 5 Nov 2023 19:18:50 +0800 +Subject: [PATCH] raise an exception instead of returning an empty list for + pkcs7 cert loading (#9947) + +* raise an exception instead of returning an empty list + +as davidben points out in #9926 we are calling a specific load +certificates function and an empty value doesn't necessarily mean empty +because PKCS7 contains multitudes. erroring is more correct. + +* changelog + +* Update CHANGELOG.rst + +Co-authored-by: Alex Gaynor + +--------- + +Co-authored-by: Alex Gaynor +--- + src/cryptography/hazmat/backends/openssl/backend.py | 7 +++++-- + tests/hazmat/primitives/test_pkcs7.py | 6 +++--- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py +index 1a1a6d1..485cf89 100644 +--- a/src/cryptography/hazmat/backends/openssl/backend.py ++++ b/src/cryptography/hazmat/backends/openssl/backend.py +@@ -2189,12 +2189,15 @@ class Backend(BackendInterface): + _Reasons.UNSUPPORTED_SERIALIZATION, + ) + +- certs: list[x509.Certificate] = [] + if p7.d.sign == self._ffi.NULL: +- return certs ++ raise ValueError( ++ "The provided PKCS7 has no certificate data, but a cert " ++ "loading method was called." ++ ) + + sk_x509 = p7.d.sign.cert + num = self._lib.sk_X509_num(sk_x509) ++ certs: list[x509.Certificate] = [] + for i in range(num): + x509 = self._lib.sk_X509_value(sk_x509, i) + self.openssl_assert(x509 != self._ffi.NULL) +diff --git a/tests/hazmat/primitives/test_pkcs7.py b/tests/hazmat/primitives/test_pkcs7.py +index e6dcd8e..96aa2f2 100644 +--- a/tests/hazmat/primitives/test_pkcs7.py ++++ b/tests/hazmat/primitives/test_pkcs7.py +@@ -81,11 +81,11 @@ class TestPKCS7Loading(object): + mode="rb", + ) + +- def test_load_pkcs7_empty_certificates(self, backend): ++ def test_load_pkcs7_empty_certificates(self): + der = b"\x30\x0B\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x07\x02" + +- certificates = pkcs7.load_der_pkcs7_certificates(der) +- assert certificates == [] ++ with pytest.raises(ValueError): ++ pkcs7.load_der_pkcs7_certificates(der) + + + # We have no public verification API and won't be adding one until we get +-- +2.33.0 + diff --git a/python-cryptography.spec b/python-cryptography.spec index 9214752..9e1f3c5 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -1,7 +1,7 @@ %global srcname cryptography Name: python-%{srcname} Version: 36.0.1 -Release: 4 +Release: 6 Summary: PyCA's cryptography library License: ASL 2.0 or BSD URL: https://cryptography.io/en/latest/ @@ -10,6 +10,9 @@ Source0: %{srcname}-%{version}.tar.gz Patch1000: 1000-add-loongarch64-support-not-upstream-modified-files.patch Patch6002: backport-provide-openssl-apis-related-to-SM-for-python.patch Patch6003: backport-CVE-2023-23931.patch +# CVE-2023-49083 +Patch6004: backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch +Patch6005: backport-raise-an-exception-instead-of-returning-an-empty-list-for-pkcs7-cert-loading.patch BuildRequires: openssl-devel cargo BuildRequires: gcc @@ -83,6 +86,12 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "not (test_ %doc README.rst docs %changelog +* Mon Dec 4 2023 liningjie - 36.0.1-6 +- raise an exception instead of returning an empty list for pkcs7 cert loading + +* Wed Nov 29 2023 liningjie - 36.0.1-5 +- Fixed crash when loading a PKCS#7 bundle with no certificates + * Sat Aug 12 2023 panchenbo - 36.0.1-4 - add loongarch64 support -- Gitee