-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bump node to v12.9.0 (master) (#19863)
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
- Loading branch information
1 parent
12b00ca
commit 6667969
Showing
8 changed files
with
53 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
patches/node/add_openssl_is_boringssl_guard_to_oaep_hash_check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Shelley Vohr <shelley.vohr@gmail.com> | ||
Date: Wed, 21 Aug 2019 12:43:26 -0700 | ||
Subject: Add OPENSSL_IS_BORINGSSL guard to oaep_hash check | ||
|
||
Adds an ifndef guard to the oaep_hash nullptr check in | ||
PublicKeyCipher::Cipher, since BORINGSSL does not expose either | ||
EVP_PKEY_OP_TYPE_CRYPT or EVP_PKEY_CTRL_RSA_OAEP_MD. | ||
|
||
diff --git a/src/node_crypto.cc b/src/node_crypto.cc | ||
index 59b60f1aea11666a7393831f8a465c247b66b009..1b44572c3a126c1ba3f610dbefb226acb34d246d 100644 | ||
--- a/src/node_crypto.cc | ||
+++ b/src/node_crypto.cc | ||
@@ -5156,11 +5156,15 @@ bool PublicKeyCipher::Cipher(Environment* env, | ||
if (EVP_PKEY_CTX_set_rsa_padding(ctx.get(), padding) <= 0) | ||
return false; | ||
|
||
+#ifdef OPENSSL_IS_BORINGSSL | ||
+ env->ThrowError("oaepHash option not supported in BoringSSL."); | ||
+#else | ||
if (oaep_hash != nullptr) { | ||
if (!EVP_PKEY_CTX_md(ctx.get(), EVP_PKEY_OP_TYPE_CRYPT, | ||
EVP_PKEY_CTRL_RSA_OAEP_MD, oaep_hash)) | ||
return false; | ||
} | ||
+#endif | ||
|
||
size_t out_len = 0; | ||
if (EVP_PKEY_cipher(ctx.get(), nullptr, &out_len, data, len) <= 0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 6 additions & 7 deletions
13
patches/node/fixme_use_redefined_version_of_internalmodulestat.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters