From 571b13d655be7f109466875994a829bcdc3b24d4 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Mon, 15 May 2023 14:39:38 +0200
Subject: [PATCH] Fix FTBFS caused by rsa_pkcs1_implicit_rejection OpenSSL
 feature

resolves: rhbz#2203840
---
 ...L-RSA-bleichenbacher-mitigation-7895.patch | 83 +++++++++++++++++++
 python-cryptography.spec                      |  8 +-
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 0007-Adapt-for-OpenSSL-RSA-bleichenbacher-mitigation-7895.patch

diff --git a/0007-Adapt-for-OpenSSL-RSA-bleichenbacher-mitigation-7895.patch b/0007-Adapt-for-OpenSSL-RSA-bleichenbacher-mitigation-7895.patch
new file mode 100644
index 0000000..7475371
--- /dev/null
+++ b/0007-Adapt-for-OpenSSL-RSA-bleichenbacher-mitigation-7895.patch
@@ -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
+
diff --git a/python-cryptography.spec b/python-cryptography.spec
index ac4c9b8..fac2b6d 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -7,7 +7,7 @@
 
 Name:           python-%{srcname}
 Version:        36.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PyCA's cryptography library
 
 License:        ASL 2.0 or BSD
@@ -24,6 +24,7 @@ Patch4:		0004-Disable-test_openssl_assert_error_on_stack-in-FIPS-m.patch
 Patch5:		0005-Fixed-serialization-of-keyusage-ext-with-no-bits-693.patch
 # https://github.com/pyca/cryptography/pull/8230
 Patch6:		0006-CVE-2023-23931.patch
+Patch7:		0007-Adapt-for-OpenSSL-RSA-bleichenbacher-mitigation-7895.patch
 
 ExclusiveArch:  %{rust_arches}
 
@@ -118,7 +119,7 @@ export OPENSSL_ENABLE_SHA1_SIGNATURES=yes
 # see rhbz#2171661 for test_load_invalid_ec_key_from_pem: error:030000CD:digital envelope routines::keymgmt export failure
 PYTHONPATH=${PWD}/vectors:%{buildroot}%{python3_sitearch} \
     %{__python3} -m pytest \
-    -k "not (test_openssl_memleak or test_load_ecdsa_no_named_curve or test_decrypt_invalid_decrypt)"
+    -k "not (test_openssl_memleak or test_load_ecdsa_no_named_curve)"
 %endif
 
 %files -n python%{python3_pkgversion}-%{srcname}
@@ -128,6 +129,9 @@ PYTHONPATH=${PWD}/vectors:%{buildroot}%{python3_sitearch} \
 %{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
 
 %changelog
+* Mon May 15 2023 Christian Heimes <cheimes@redhat.com> - 36.0.1-4
+- Fix FTBFS caused by rsa_pkcs1_implicit_rejection OpenSSL feature, resolves rhbz#2203840
+
 * Wed Feb 22 2023 Christian Heimes <cheimes@redhat.com> - 36.0.1-3
 - Fix CVE-2023-23931: Don't allow update_into to mutate immutable objects, resolves rhbz#2172399
 - Fix FTBFS due to failing test_load_invalid_ec_key_from_pem and test_decrypt_invalid_decrypt