SOURCES/0006-CVE-2023-23931.patch

@@ -1,42 +0,0 @@
-From 94a50a9731f35405f0357fa5f3b177d46a726ab3 Mon Sep 17 00:00:00 2001
-From: Alex Gaynor <alex.gaynor@gmail.com>
-Date: Tue, 31 Jan 2023 08:33:54 -0500
-Subject: [PATCH] Don't allow update_into to mutate immutable objects
-
----
- src/cryptography/hazmat/backends/openssl/ciphers.py | 2 +-
- tests/hazmat/primitives/test_ciphers.py             | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
-index 286583f9325..075d68fb905 100644
---- a/src/cryptography/hazmat/backends/openssl/ciphers.py
-+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
-@@ -156,7 +156,7 @@ def update_into(self, data: bytes, buf: bytes) -> int:
-         data_processed = 0
-         total_out = 0
-         outlen = self._backend._ffi.new("int *")
--        baseoutbuf = self._backend._ffi.from_buffer(buf)
-+        baseoutbuf = self._backend._ffi.from_buffer(buf, require_writable=True)
-         baseinbuf = self._backend._ffi.from_buffer(data)
- 
-         while data_processed != total_data_len:
-diff --git a/tests/hazmat/primitives/test_ciphers.py b/tests/hazmat/primitives/test_ciphers.py
-index 02127dd9cab..bf3b047dec2 100644
---- a/tests/hazmat/primitives/test_ciphers.py
-+++ b/tests/hazmat/primitives/test_ciphers.py
-@@ -318,6 +318,14 @@ def test_update_into_buffer_too_small(self, backend):
-         with pytest.raises(ValueError):
-             encryptor.update_into(b"testing", buf)
- 
-+    def test_update_into_immutable(self, backend):
-+        key = b"\x00" * 16
-+        c = ciphers.Cipher(AES(key), modes.ECB(), backend)
-+        encryptor = c.encryptor()
-+        buf = b"\x00" * 32
-+        with pytest.raises((TypeError, BufferError)):
-+            encryptor.update_into(b"testing", buf)
-+
-     @pytest.mark.supported(
-         only_if=lambda backend: backend.cipher_supported(
-             AES(b"\x00" * 16), modes.GCM(b"\x00" * 12)

SPECS/python-cryptography.spec

@@ -1,12 +1,10 @@
 %{!?python3_pkgversion:%global python3_pkgversion 3}
 
 %global srcname cryptography
-# rhbz#2172416: from_buffer(..., require_writable=True)
-%global cffi_version 1.11.5-6
 
 Name:           python-%{srcname}
 Version:        3.2.1
-Release:        7%{?dist}
+Release:        5%{?dist}
 Summary:        PyCA's cryptography library
 
 Group:          Development/Libraries
@@ -19,8 +17,6 @@ Patch0002:      0002-Support-pytest-3.4.2.patch
 Patch0003:	0003-Skip-iso8601-test-cases.patch
 Patch0004:	0004-Revert-remove-NPN-bindings.patch
 Patch0005:	0005-CVE-2020-36242.patch
-# https://github.com/pyca/cryptography/pull/8230
-Patch0006:		0006-CVE-2023-23931.patch
 
 BuildRequires:  openssl-devel
 BuildRequires:  gcc
@@ -33,7 +29,7 @@ BuildRequires:  python%{python3_pkgversion}-pretend
 BuildRequires:  python%{python3_pkgversion}-cryptography-vectors = %{version}
 BuildRequires:  python%{python3_pkgversion}-pytz
 BuildRequires:  python%{python3_pkgversion}-six >= 1.4.1
-BuildRequires:  python%{python3_pkgversion}-cffi >= %{cffi_version}
+BuildRequires:  python%{python3_pkgversion}-cffi >= 1.7
 
 %description
 cryptography is a package designed to expose cryptographic primitives and
@@ -46,7 +42,7 @@ Summary:        PyCA's cryptography library
 
 Requires:       openssl-libs
 Requires:       python%{python3_pkgversion}-six >= 1.4.1
-Requires:       python%{python3_pkgversion}-cffi >= %{cffi_version}
+Requires:       python%{python3_pkgversion}-cffi >= 1.7
 Conflicts:      python%{python3_pkgversion}-cryptography-vectors < %{version}
 Conflicts:      python%{python3_pkgversion}-cryptography-vectors > %{version}
 
@@ -75,9 +71,7 @@ find . -name .keep -print -delete
 rm -f tests/hazmat/primitives/test_padding.py
 # don't run hypothesis tests
 rm -rf tests/hypothesis
-PYTHONPATH=%{buildroot}%{python3_sitearch} \
-    %{__python3} -m pytest \
-    -k "not test_decrypt_invalid_decrypt"
+PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest
 
 
 %files -n python%{python3_pkgversion}-%{srcname}
@@ -88,12 +82,6 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 
 
 %changelog
-* 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
-
-* Wed Feb 22 2023 Christian Heimes <cheimes@redhat.com> - 3.2.1-6
-- Fix CVE-2023-23931: Don't allow update_into to mutate immutable objects, resolves rhbz#2172404
-
 * Tue Jun 08 2021 Christian Heimes <cheimes@redhat.com> - 3.2.1-5
 - Rebuild for RHEL 8.5
 - Resolves: rhbz#1933071