diff --git a/0006-CVE-2023-23931.patch b/0006-CVE-2023-23931.patch new file mode 100644 index 0000000000000000000000000000000000000000..085947cfe64e0069e147fadc9c61f5cdbd5db52a --- /dev/null +++ b/0006-CVE-2023-23931.patch @@ -0,0 +1,42 @@ +From 94a50a9731f35405f0357fa5f3b177d46a726ab3 Mon Sep 17 00:00:00 2001 +From: Alex Gaynor +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) diff --git a/cryptography-3.3.1.tar.gz b/cryptography-3.3.1.tar.gz deleted file mode 100644 index 4d9671e137977c843779ee4fb70e1315c71f5328..0000000000000000000000000000000000000000 Binary files a/cryptography-3.3.1.tar.gz and /dev/null differ diff --git a/cryptography-3.3.1.tar.gz.asc b/cryptography-3.3.1.tar.gz.asc deleted file mode 100644 index 99af04574f3accfc1fc0f010bc3db33638446008..0000000000000000000000000000000000000000 --- a/cryptography-3.3.1.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEBf2foWz3VzUNkaVgI1rl8Sn57ZgFAl/RhUIACgkQI1rl8Sn5 -7ZibhQgAuSzb/GFPzSnTZN+lRPMTeDH33Eave/Z/ykvIfw81pGJi3h/Nb33A3u9N -NRgoOvjnSBAB9T3ck/S//vj+0mH1fZIpiiop8oUUxEJQ+/I7o5Mo++H8kjPB8PA2 -IsELZCb7peQ1B6TWKIOV0mnprYRwvHUUM6oe8oblU3Zy/ptHm/ZQsEVx4J5pbach -S6AB3BnAlM36jBZLE3IIVplX27xAt/o83KUGtpfTQ//O9CQ6YjvTppXMwwo91AUK -4TsSN+CBvX7WiCDZjcVuv5QL1gcEZHv2UauliD5n8CEkyWA15ahHvLHhFSb1ECV3 -wRRIWsY2HUMvNddCt9QHEFQajficCA== -=2lBg ------END PGP SIGNATURE----- diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..c0732835c1ecfb035a778589879e6206b4b7c64e --- /dev/null +++ b/download @@ -0,0 +1,2 @@ +6faa1a7125c500c0e1586ad342ba3b30 cryptography-3.3.1.tar.gz +78a0fdba84dd8a263733e14f164c1f38 cryptography-3.3.1.tar.gz.asc diff --git a/python-cryptography.spec b/python-cryptography.spec index 02898df862a7c28d5101b7e76669a54e5ee5fa0a..8159dbd5fdcd6cd10a87fcffea6b96cffc554c78 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -11,7 +11,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PyCA's cryptography library License: ASL 2.0 or BSD @@ -29,6 +29,10 @@ Source2: gpgkey-05FD_9FA1_6CF7_5735_0D91_A560_235A_E5F1_29F9_ED98.gpg # See: https://projects.engineering.redhat.com/browse/RCM-72605 ExcludeArch: i686 +# Security fix for CVE-2023-23931 +# Resolved upstream: https://github.com/pyca/cryptography/pull/8230 +Patch0006: 0006-CVE-2023-23931.patch + BuildRequires: openssl-devel BuildRequires: gcc BuildRequires: gnupg2 @@ -168,6 +172,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "not (test_ %changelog +* Tue Aug 15 2023 Christian Heimes - 3.3.1-3 +- Fix CVE-2023-23931: Don't allow update_into to mutate immutable objects, +- Resolves RHEL-4932 + * Mon Jan 18 2021 Tomas Orsava - 3.3.1-2 - Convert from Fedora to the python39 module in RHEL8 - Resolves: rhbz#1877430