crypto: add OPENSSL_IS_BORINGSSL guard - #39138
Closed
codebytere wants to merge 1 commit into
Closed
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
tniessen
reviewed
Jun 25, 2021
Comment thread
src/node.cc
Outdated
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
tniessen
approved these changes
Jun 27, 2021
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Trott
approved these changes
Jun 28, 2021
codebytere
added a commit
that referenced
this pull request
Jun 29, 2021
PR-URL: #39138 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rich Trott <rtrott@gmail.com>
targos
pushed a commit
that referenced
this pull request
Jul 11, 2021
PR-URL: #39138 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rich Trott <rtrott@gmail.com>
codebytere
added a commit
to electron/electron
that referenced
this pull request
Jul 14, 2021
jkleinsc
added a commit
to electron/electron
that referenced
this pull request
Jul 15, 2021
* chore: bump node in DEPS to v16.4.2 * chore: update patches * ci: run main and remote woa tests separately * chore: bump node in DEPS to v16.5.0 * build: restore libplatform headers in distribution nodejs/node#39288 * build: pass directory instead of list of files to js2c.py nodejs/node#39069 * chore: various BoringSSL/OpenSSL upstreams - nodejs/node#39136 - nodejs/node#39138 - nodejs/node#39054 * test: move debugger test case to parallel nodejs/node#39300 * chore: fixup patch indices * build: pass directory instead of list of files to js2c.py nodejs/node#39069 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
BlackHole1
pushed a commit
to BlackHole1/electron
that referenced
this pull request
Aug 30, 2021
* chore: bump node in DEPS to v16.4.2 * chore: update patches * ci: run main and remote woa tests separately * chore: bump node in DEPS to v16.5.0 * build: restore libplatform headers in distribution nodejs/node#39288 * build: pass directory instead of list of files to js2c.py nodejs/node#39069 * chore: various BoringSSL/OpenSSL upstreams - nodejs/node#39136 - nodejs/node#39138 - nodejs/node#39054 * test: move debugger test case to parallel nodejs/node#39300 * chore: fixup patch indices * build: pass directory instead of list of files to js2c.py nodejs/node#39069 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #38888 - that PR addressed most of our needs but I neglected to include the guard for OPENSSL_IS_BORINGSSL.
This is necessary over and above the initialization flags conditional because several functions including OPENSSL_init() are not defined in BoringSSL, so while they might not be called for us anymore under the previous PR they still exist for the compiler and cause compiler errors. This fixes that.