!48 fix CVE-2023-23931
From: @zhuofeng6 Reviewed-by: @gaoruoshu Signed-off-by: @gaoruoshu
This commit is contained in:
commit
e9af0199eb
45
backport-CVE-2023-23931.patch
Normal file
45
backport-CVE-2023-23931.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
From 9fbf84efc861668755ab645530ec7be9cf3c6696 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||||
|
Date: Tue, 7 Feb 2023 11:34:18 -0500
|
||||||
|
Subject: [PATCH] Don't allow update_into to mutate immutable objects (#8230)
|
||||||
|
|
||||||
|
---
|
||||||
|
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 d5b6010..a5737dc 100644
|
||||||
|
--- a/src/cryptography/hazmat/backends/openssl/ciphers.py
|
||||||
|
+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
|
||||||
|
@@ -155,7 +155,7 @@ class _CipherContext(object):
|
||||||
|
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 ef57790..977f148 100644
|
||||||
|
--- a/tests/hazmat/primitives/test_ciphers.py
|
||||||
|
+++ b/tests/hazmat/primitives/test_ciphers.py
|
||||||
|
@@ -306,6 +306,14 @@ class TestCipherUpdateInto(object):
|
||||||
|
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)
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,14 @@
|
|||||||
%global srcname cryptography
|
%global srcname cryptography
|
||||||
Name: python-%{srcname}
|
Name: python-%{srcname}
|
||||||
Version: 39.0.0
|
Version: 39.0.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: PyCA's cryptography library
|
Summary: PyCA's cryptography library
|
||||||
License: ASL 2.0 or BSD
|
License: ASL 2.0 or BSD
|
||||||
URL: https://cryptography.io/en/latest/
|
URL: https://cryptography.io/en/latest/
|
||||||
Source0: %{srcname}-%{version}.tar.gz
|
Source0: %{srcname}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch6001: backport-CVE-2023-23931.patch
|
||||||
|
|
||||||
BuildRequires: openssl-devel cargo
|
BuildRequires: openssl-devel cargo
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
|
||||||
@ -80,6 +82,12 @@ EOF
|
|||||||
%doc README.rst docs
|
%doc README.rst docs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 14 2023 zhuofeng<zhuofeng2@huawei.com> - 39.0.0-2
|
||||||
|
- Type:CVE
|
||||||
|
- CVE:CVE-2023-23931
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix CVE-2023-23931
|
||||||
|
|
||||||
* Fri Feb 3 2023 huangduirong <huangduirong@huawei.com> - 39.0.0-1
|
* Fri Feb 3 2023 huangduirong <huangduirong@huawei.com> - 39.0.0-1
|
||||||
- Upgrade package to 39.0.0
|
- Upgrade package to 39.0.0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user