From 0e648affb90c60d7cba41a08f0285af95d46dce0 Mon Sep 17 00:00:00 2001
From: liningjie <liningjie@xfusion.com>
Date: Wed, 29 Nov 2023 11:14:44 +0800
Subject: [PATCH] Fixed crash when loading a PKCS#7 bundle with no certificates

(cherry picked from commit 65e270519e1abefa12701fd3539dec4d5af833ed)
---
 ...a-PKCS-7-bundle-with-no-certificates.patch | 49 +++++++++++++++++++
 python-cryptography.spec                      |  6 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.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..0eda47b
--- /dev/null
+++ b/backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch
@@ -0,0 +1,49 @@
+From d91a2bfac268db6093ee1f02443bb1f2e78c74ff Mon Sep 17 00:00:00 2001
+From: Alex Gaynor <alex.gaynor@gmail.com>
+Date: Wed, 29 Nov 2023 10:56:37 +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 ff9c23c..ba0fad0 100644
+--- a/src/cryptography/hazmat/backends/openssl/backend.py
++++ b/src/cryptography/hazmat/backends/openssl/backend.py
+@@ -2669,9 +2669,12 @@ class Backend(object):
+                 _Reasons.UNSUPPORTED_SERIALIZATION,
+             )
+ 
++        certs = []
++        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 8b93cb6..0145a24 100644
+--- a/tests/hazmat/primitives/test_pkcs7.py
++++ b/tests/hazmat/primitives/test_pkcs7.py
+@@ -80,6 +80,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/python-cryptography.spec b/python-cryptography.spec
index 9665ecf..0c3ac08 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -3,7 +3,7 @@
 %global srcname cryptography
 Name:           python-%{srcname}
 Version:        3.3.1
-Release:        3
+Release:        4
 Summary:        PyCA's cryptography library
 License:        ASL 2.0 or BSD
 URL:            https://cryptography.io/en/latest/  
@@ -13,6 +13,7 @@ Patch6000:      backport-CVE-2020-36242.patch
 Patch6001:      backport-add-SM4-symmetric-block-cipher-5834.patch
 Patch6002:      backport-provide-openssl-apis-related-to-SM-for-python.patch
 Patch6003:      backport-CVE-2023-23931.patch
+Patch6004:      backport-Fixed-crash-when-loading-a-PKCS-7-bundle-with-no-certificates.patch
 
 BuildRequires:  openssl-devel
 BuildRequires:  gcc
@@ -122,6 +123,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "not (test_
 %doc README.rst docs
 
 %changelog
+* Wed Nov 29 2023 liningjie <liningjie@xfusion.com> - 3.3.1-4
+- Fixed crash when loading a PKCS#7 bundle with no certificates
+
 * Tue Feb 14 2023 zhuofeng<zhuofeng2@huawei.com> - 3.3.1-3
 - Type:CVE
 - CVE:CVE-2023-23931
-- 
Gitee