mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: reduce crypto patch surface (#20646)

Browse source 
* reduce oaeplabel_option patch

* remove now-compatible patch

* note upstream
This commit is contained in:
Shelley Vohr 2019-10-21 08:02:23 -07:00 • committed by GitHub
parent 7b28cd33cb
commit 0abbb35c4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/node/revert_crypto_add_oaeplabel_option.patch
View file

@ -3,13 +3,15 @@ From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 15 Oct 2019 11:30:27 -0700
Subject: Revert "crypto: add oaepLabel option"
This partially reverts commit 54f327b4dcb37f373bc4146686c7e4edcd9c524d.
This partially reverts https://github.com/nodejs/node/pull/29489.
The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this should
be removed when the associated update is rolled into Chromium.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index be53ccc9759fcfb4cfa301e02fee6ff46b681033..2f73b3dc13a7f38b44f5f095da5dae3e24e7a629 100644
index 63dd6a1863..1ca4c75d64 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5188,16 +5186,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
@@ -5188,17 +5188,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
return false;
}
@ -17,7 +19,8 @@ index be53ccc9759fcfb4cfa301e02fee6ff46b681033..2f73b3dc13a7f38b44f5f095da5dae3e
- // OpenSSL takes ownership of the label, so we need to create a copy.
- void* label = OPENSSL_memdup(oaep_label, oaep_label_len);
- CHECK_NOT_NULL(label);
- if (!EVP_PKEY_CTX_set0_rsa_oaep_label(ctx.get(), label, oaep_label_len)) {
- if (0 >= EVP_PKEY_CTX_set0_rsa_oaep_label(ctx.get(), label,
- oaep_label_len)) {
- OPENSSL_free(label);
- return false;
- }