Skip to content

Commit

Permalink
Fixed crash when loading a PKCS#7 bundle with no certificates (pyca#9926
Browse files Browse the repository at this point in the history
)

Backport of f09c261
Fix CVE-2023-49083
  • Loading branch information
Anselm Kruis committed Dec 4, 2024
1 parent ef34ba6 commit 5d30bfa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/cryptography/hazmat/backends/openssl/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2675,9 +2675,12 @@ def _load_pkcs7_certificates(self, p7):
_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)
Expand Down
6 changes: 6 additions & 0 deletions tests/hazmat/primitives/test_pkcs7.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ def test_load_pkcs7_unsupported_type(self):
),
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 == []

0 comments on commit 5d30bfa

Please sign in to comment.