chore: rework BoringSSL with Node.js incompatibilities patch by claude[bot] · Pull Request #55039 · electron/electron · GitHub
Skip to content

chore: rework BoringSSL with Node.js incompatibilities patch - #55039

Merged
MarshallOfSound merged 1 commit into
45-x-yfrom
manual-bp/claude/pr/55037/branch/45-x-y
Oct 16, 2026
Merged

MarshallOfSound merged 1 commit into
45-x-yfrom
manual-bp/claude/pr/55037/branch/45-x-y

Conversation

@claude

@claude claude Bot commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

Requested by David Babenko-Sanders · Slack thread

Description of Change

Manually backport #55037. See that PR for details.

CC @dsanders11

The cherry-pick conflicted only in the generated index and hunk headers of the node patches, because this branch's node patch series differs from main's (src_backport_the_perfetto_trace_agent.patch on main is src_add_perfetto_trace_agent.patch here), so I rebuilt them by applying this branch's series plus the change to Node.js v24.22.0 and re-exporting with script/git-export-patches, which gives the same Node.js source delta as on main.

Checklist

🤖 Generated with Claude Code

https://claude.ai/code/session_01FEtfbdwkKabsmYWAF8Sqsw

Release Notes

Notes: none


Generated by Claude Code

* chore: adopt nodejs/node#66752 in BoringSSL node patch

Rework fix_handle_boringssl_and_openssl_incompatibilities.patch to carry
the OPENSSL_SIZE_T changes from nodejs/node#66752
verbatim instead of Electron's own size_t edits, so the patch drops out
cleanly once Electron updates to a Node.js version that includes it.

Also drop the `#if 0` guards in src/node_metadata.h and
src/node_options.h, restoring upstream's `#if HAVE_OPENSSL`. BoringSSL
provides the OpenSSL headers they include and the quic guard keeps
openssl/quic.h out, so the guards are no longer needed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XoTevKUU5Yqx5KULydnHjv

* fix: add BoringSSL include path to node snapshot targets

With the `#if 0` guards gone, src/node_options.h and src/node_metadata.h
include <openssl/opensslv.h> and <openssl/crypto.h> again whenever
HAVE_OPENSSL is set. The :node_snapshot and :node_snapshot_stub source
sets get HAVE_OPENSSL=1 from :node_internal_config but did not depend on
//third_party/boringssl, so they had no BoringSSL include path and the
Windows build failed with "'openssl/opensslv.h' file not found" when
compiling node_snapshot.cc.

Depend on //third_party/boringssl from both targets when
node_use_openssl is set, so they see the same headers as libnode.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XoTevKUU5Yqx5KULydnHjv

* chore: use $node_openssl_path for node snapshot OpenSSL dep

Depend on "$node_openssl_path" rather than hard-coding
//third_party/boringssl in the :node_snapshot and :node_snapshot_stub
targets, matching how upstream's unofficial.gni references OpenSSL.
Electron sets node_openssl_path = "//third_party/boringssl" in
build/args/all.gn, so the resolved dependency is unchanged.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XoTevKUU5Yqx5KULydnHjv

---------

Co-authored-by: Claude <noreply@anthropic.com>

(cherry picked from commit deec352)

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FEtfbdwkKabsmYWAF8Sqsw
@claude
claude Bot requested a review from a team as a code owner October 16, 2026 04:24
@trop
trop Bot requested a review from dsanders11 October 16, 2026 04:24
@trop trop Bot added 45-x-y backport This is a backport PR semver/none labels Oct 16, 2026
@MarshallOfSound
MarshallOfSound merged commit a949e33 into 45-x-y Oct 16, 2026
91 checks passed
@release-clerk

release-clerk Bot commented Oct 16, 2026

Copy link
Copy Markdown

@MarshallOfSound
MarshallOfSound deleted the manual-bp/claude/pr/55037/branch/45-x-y branch October 16, 2026 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

3 participants