Fix CVE-2023-49083: NULL-dereference when loading PKCS7 certificates
resolves: RHEL-97452
This commit is contained in:
parent
6dc0b661da
commit
719dd961c8
45
0008-CVE-2023-49083.patch
Normal file
45
0008-CVE-2023-49083.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
From 66cb448876b1e95b637461d13560b970bae09e08 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||||
|
Date: Wed, 22 Nov 2023 16:49:56 -0500
|
||||||
|
Subject: [PATCH] Fixed crash when loading a PKCS#7 bundle with no certificates
|
||||||
|
|
||||||
|
---
|
||||||
|
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 7c08862b307..adfd7aefe5f 100644
|
||||||
|
--- a/src/cryptography/hazmat/backends/openssl/backend.py
|
||||||
|
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
|
||||||
|
@@ -1111,9 +1111,12 @@ def _load_pkcs7_certificates(self, p7) -> list[x509.Certificate]:
|
||||||
|
_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 ceb84e5fb48..434a361057f 100644
|
||||||
|
--- a/tests/hazmat/primitives/test_pkcs7.py
|
||||||
|
+++ b/tests/hazmat/primitives/test_pkcs7.py
|
||||||
|
@@ -89,6 +89,12 @@ def test_load_pkcs7_unsupported_type(self, backend):
|
||||||
|
mode="rb",
|
||||||
|
)
|
||||||
|
|
||||||
|
+ 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 == []
|
||||||
|
+
|
||||||
|
|
||||||
|
# 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
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: python-%{srcname}
|
Name: python-%{srcname}
|
||||||
Version: 3.2.1
|
Version: 3.2.1
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: PyCA's cryptography library
|
Summary: PyCA's cryptography library
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -21,6 +21,7 @@ Patch0004: 0004-Revert-remove-NPN-bindings.patch
|
|||||||
Patch0005: 0005-CVE-2020-36242.patch
|
Patch0005: 0005-CVE-2020-36242.patch
|
||||||
# https://github.com/pyca/cryptography/pull/8230
|
# https://github.com/pyca/cryptography/pull/8230
|
||||||
Patch0006: 0006-CVE-2023-23931.patch
|
Patch0006: 0006-CVE-2023-23931.patch
|
||||||
|
Patch0007: 0008-CVE-2023-49083.patch
|
||||||
|
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -88,6 +89,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 02 2025 Francisco Triviño <ftrivino@redhat.com> - 3.2.1-8
|
||||||
|
- Fix CVE-2023-49083: NULL-dereference when loading PKCS7 certificates,
|
||||||
|
resolves RHEL-97452
|
||||||
|
|
||||||
* Fri Dec 01 2023 Christian Heimes <cheimes@redhat.com> - 3.2.1-7
|
* Fri Dec 01 2023 Christian Heimes <cheimes@redhat.com> - 3.2.1-7
|
||||||
- Fix FTBFS caused by rsa_pkcs1_implicit_rejection OpenSSL feature, resolves: RHEL-17873
|
- Fix FTBFS caused by rsa_pkcs1_implicit_rejection OpenSSL feature, resolves: RHEL-17873
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user