mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: enable TLS renegotiation in node (#25040)
This commit is contained in:
@@ -46,3 +46,4 @@ lib_src_switch_buffer_kmaxlength_to_size_t.patch
|
||||
update_tests_after_increasing_typed_array_size.patch
|
||||
darwin_work_around_clock_jumping_back_in_time.patch
|
||||
lib_use_non-symbols_in_isurlinstance_check.patch
|
||||
fix_enable_tls_renegotiation.patch
|
||||
|
||||
27
patches/node/fix_enable_tls_renegotiation.patch
Normal file
27
patches/node/fix_enable_tls_renegotiation.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Rose <nornagon@nornagon.net>
|
||||
Date: Tue, 18 Aug 2020 09:51:46 -0700
|
||||
Subject: fix: enable TLS renegotiation
|
||||
|
||||
This configures BoringSSL to behave more similarly to OpenSSL.
|
||||
See https://github.com/electron/electron/issues/18380.
|
||||
|
||||
This should be upstreamed.
|
||||
|
||||
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
|
||||
index 36877424216ed458eeb7a0796703afb667b89f7c..63546540163abe08eb8c701dda9272c135fb36c0 100644
|
||||
--- a/src/tls_wrap.cc
|
||||
+++ b/src/tls_wrap.cc
|
||||
@@ -129,6 +129,12 @@ void TLSWrap::InitSSL() {
|
||||
// - https://wiki.openssl.org/index.php/TLS1.3#Non-application_data_records
|
||||
SSL_set_mode(ssl_.get(), SSL_MODE_AUTO_RETRY);
|
||||
|
||||
+#ifdef OPENSSL_IS_BORINGSSL
|
||||
+ // OpenSSL allows renegotiation by default, but BoringSSL disables it.
|
||||
+ // Configure BoringSSL to match OpenSSL's behavior.
|
||||
+ SSL_set_renegotiate_mode(ssl_.get(), ssl_renegotiate_freely);
|
||||
+#endif
|
||||
+
|
||||
SSL_set_app_data(ssl_.get(), this);
|
||||
// Using InfoCallback isn't how we are supposed to check handshake progress:
|
||||
// https://github.com/openssl/openssl/issues/7199#issuecomment-420915993
|
||||
Reference in New Issue
Block a user