MSVSphere Packaging Team
1 year ago
parent
2067c5f263
commit
22c1c30fdc
@ -0,0 +1,42 @@
|
|||||||
|
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)
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
From ca92d13436944090faa79ffc25378c45ec564a4d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||||
|
Date: Wed, 14 Dec 2022 01:50:06 -0500
|
||||||
|
Subject: [PATCH] Adapt for OpenSSL RSA bleichenbacher mitigation (#7895)
|
||||||
|
|
||||||
|
Attempt to work-around wycheproof tests
|
||||||
|
---
|
||||||
|
src/_cffi_src/openssl/rsa.py | 8 ++++++++
|
||||||
|
tests/hazmat/primitives/test_rsa.py | 5 +++--
|
||||||
|
tests/wycheproof/test_rsa.py | 20 +++++++++++++++-----
|
||||||
|
3 files changed, 26 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py
|
||||||
|
index 5d1e163b1..2682ea1e4 100644
|
||||||
|
--- a/src/_cffi_src/openssl/rsa.py
|
||||||
|
+++ b/src/_cffi_src/openssl/rsa.py
|
||||||
|
@@ -18,6 +18,8 @@ static const int RSA_F4;
|
||||||
|
|
||||||
|
static const int Cryptography_HAS_RSA_OAEP_MD;
|
||||||
|
static const int Cryptography_HAS_RSA_OAEP_LABEL;
|
||||||
|
+
|
||||||
|
+static const int Cryptography_HAS_IMPLICIT_RSA_REJECTION;
|
||||||
|
"""
|
||||||
|
|
||||||
|
FUNCTIONS = """
|
||||||
|
@@ -57,4 +59,10 @@ int (*EVP_PKEY_CTX_set_rsa_oaep_md)(EVP_PKEY_CTX *, EVP_MD *) = NULL;
|
||||||
|
int (*EVP_PKEY_CTX_set0_rsa_oaep_label)(EVP_PKEY_CTX *, unsigned char *,
|
||||||
|
int) = NULL;
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+#if defined(EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION)
|
||||||
|
+static const int Cryptography_HAS_IMPLICIT_RSA_REJECTION = 1;
|
||||||
|
+#else
|
||||||
|
+static const int Cryptography_HAS_IMPLICIT_RSA_REJECTION = 0;
|
||||||
|
+#endif
|
||||||
|
"""
|
||||||
|
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
|
||||||
|
index 4fb205db4..0315489dc 100644
|
||||||
|
--- a/tests/hazmat/primitives/test_rsa.py
|
||||||
|
+++ b/tests/hazmat/primitives/test_rsa.py
|
||||||
|
@@ -1551,8 +1551,9 @@ class TestRSADecryption(object):
|
||||||
|
private_key.decrypt(b"0" * 256, DummyAsymmetricPadding())
|
||||||
|
|
||||||
|
@pytest.mark.supported(
|
||||||
|
- only_if=lambda backend: backend.rsa_padding_supported(
|
||||||
|
- padding.PKCS1v15()
|
||||||
|
+ only_if=lambda backend: (
|
||||||
|
+ backend.rsa_padding_supported(padding.PKCS1v15())
|
||||||
|
+ and not backend._lib.Cryptography_HAS_IMPLICIT_RSA_REJECTION
|
||||||
|
),
|
||||||
|
skip_message="Does not support PKCS1v1.5.",
|
||||||
|
)
|
||||||
|
diff --git a/tests/wycheproof/test_rsa.py b/tests/wycheproof/test_rsa.py
|
||||||
|
index 79fd682b7..e6bd8af8a 100644
|
||||||
|
--- a/tests/wycheproof/test_rsa.py
|
||||||
|
+++ b/tests/wycheproof/test_rsa.py
|
||||||
|
@@ -245,8 +245,18 @@ def test_rsa_pkcs1_encryption(backend, wycheproof):
|
||||||
|
)
|
||||||
|
assert pt == binascii.unhexlify(wycheproof.testcase["msg"])
|
||||||
|
else:
|
||||||
|
- with pytest.raises(ValueError):
|
||||||
|
- key.decrypt(
|
||||||
|
- binascii.unhexlify(wycheproof.testcase["ct"]),
|
||||||
|
- padding.PKCS1v15(),
|
||||||
|
- )
|
||||||
|
+ if backend._lib.Cryptography_HAS_IMPLICIT_RSA_REJECTION:
|
||||||
|
+ try:
|
||||||
|
+ assert key.decrypt(
|
||||||
|
+ binascii.unhexlify(wycheproof.testcase["ct"]),
|
||||||
|
+ padding.PKCS1v15(),
|
||||||
|
+ ) != binascii.unhexlify(wycheproof.testcase["ct"])
|
||||||
|
+ except ValueError:
|
||||||
|
+ # Some raise ValueError due to length mismatch.
|
||||||
|
+ pass
|
||||||
|
+ else:
|
||||||
|
+ with pytest.raises(ValueError):
|
||||||
|
+ key.decrypt(
|
||||||
|
+ binascii.unhexlify(wycheproof.testcase["ct"]),
|
||||||
|
+ padding.PKCS1v15(),
|
||||||
|
+ )
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
Loading…
Reference in new issue