From 801f99e107cd1d299f90c72f47e4961a3aa4bae7 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 11 Oct 2021 03:07:17 +0200
Subject: [PATCH] chore: remove BoringSSL patch redundancy (#31323)

* chore: emove BoringSSL patch redundancy

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 ...ndle_boringssl_and_openssl_incompatibilities.patch | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
index 87d538227068c..c590a805a0d66 100644
--- a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
+++ b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -222,18 +222,9 @@ index 7cb4513f9ad0eaadd055b169520ae1e5073b7e2d..50a6663966cdb147a702df21240fa449
      THROW_ERR_CRYPTO_OPERATION_FAILED(env, "could not generate prime");
      return Nothing<bool>();
 diff --git a/src/crypto/crypto_rsa.cc b/src/crypto/crypto_rsa.cc
-index d2307c33f5de8733b1343225a3fe6a700d1f51e4..fd31caa1355cd7be98992411b9cda2dbb500f211 100644
+index d2307c33f5de8733b1343225a3fe6a700d1f51e4..0870657be060a58aa3337c0b9e4b8cabe4a31128 100644
 --- a/src/crypto/crypto_rsa.cc
 +++ b/src/crypto/crypto_rsa.cc
-@@ -580,7 +580,7 @@ Maybe<bool> GetRsaKeyDetail(
-     // In that case, RSA_get0_pss_params does not return nullptr but all fields
-     // of the returned RSA_PSS_PARAMS will be set to nullptr.
- 
--    const RSA_PSS_PARAMS* params = RSA_get0_pss_params(rsa);
-+    const RSA_PSS_PARAMS* params = nullptr; // RSA_get0_pss_params(rsa);
-     if (params != nullptr) {
-       int hash_nid = NID_sha1;
-       int mgf_nid = NID_mgf1;
 @@ -621,10 +621,11 @@ Maybe<bool> GetRsaKeyDetail(
        }