summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch')
-rw-r--r--meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch b/meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch
new file mode 100644
index 0000000000..6ef50a0084
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cryptography/CVE-2023-23931.patch
@@ -0,0 +1,45 @@
1From 9fbf84efc861668755ab645530ec7be9cf3c6696 Mon Sep 17 00:00:00 2001
2From: Alex Gaynor <alex.gaynor@gmail.com>
3Date: Tue, 7 Feb 2023 11:34:18 -0500
4Subject: [PATCH] Don't allow update_into to mutate immutable objects (#8230)
5
6Upstream-Status: Backport [https://github.com/pyca/cryptography/commit/9fbf84efc861668755ab645530ec7be9cf3c6696]
7CVE: CVE-2023-23931
8Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
9---
10 src/cryptography/hazmat/backends/openssl/ciphers.py | 2 +-
11 tests/hazmat/primitives/test_ciphers.py | 8 ++++++++
12 2 files changed, 9 insertions(+), 1 deletion(-)
13
14diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
15index 286583f9325..075d68fb905 100644
16--- a/src/cryptography/hazmat/backends/openssl/ciphers.py
17+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
18@@ -156,7 +156,7 @@ def update_into(self, data: bytes, buf: bytes) -> int:
19 data_processed = 0
20 total_out = 0
21 outlen = self._backend._ffi.new("int *")
22- baseoutbuf = self._backend._ffi.from_buffer(buf)
23+ baseoutbuf = self._backend._ffi.from_buffer(buf, require_writable=True)
24 baseinbuf = self._backend._ffi.from_buffer(data)
25
26 while data_processed != total_data_len:
27diff --git a/tests/hazmat/primitives/test_ciphers.py b/tests/hazmat/primitives/test_ciphers.py
28index 02127dd9cab..bf3b047dec2 100644
29--- a/tests/hazmat/primitives/test_ciphers.py
30+++ b/tests/hazmat/primitives/test_ciphers.py
31@@ -318,6 +318,14 @@ def test_update_into_buffer_too_small(self, backend):
32 with pytest.raises(ValueError):
33 encryptor.update_into(b"testing", buf)
34
35+ def test_update_into_immutable(self, backend):
36+ key = b"\x00" * 16
37+ c = ciphers.Cipher(AES(key), modes.ECB(), backend)
38+ encryptor = c.encryptor()
39+ buf = b"\x00" * 32
40+ with pytest.raises((TypeError, BufferError)):
41+ encryptor.update_into(b"testing", buf)
42+
43 @pytest.mark.supported(
44 only_if=lambda backend: backend.cipher_supported(
45 AES(b"\x00" * 16), modes.GCM(b"\x00" * 12)