Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crypto: add OPENSSL_IS_BORINGSSL guard #39138

Closed
wants to merge 1 commit into from

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented Jun 24, 2021

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.

@github-actions github-actions bot added c++ Issues and PRs that require attention from people who are familiar with C++. needs-ci PRs that need a full CI run. labels Jun 24, 2021
@codebytere codebytere added the crypto Issues and PRs related to the crypto subsystem. label Jun 24, 2021
src/node.cc Show resolved Hide resolved
@nodejs-github-bot
Copy link
Collaborator

@codebytere codebytere removed the needs-ci PRs that need a full CI run. label Jun 25, 2021
@nodejs-github-bot
Copy link
Collaborator

@codebytere
Copy link
Member Author

Landed in 161b84c

@codebytere codebytere closed this Jun 29, 2021
@codebytere codebytere deleted the add-guard branch June 29, 2021 12:10
codebytere added a commit that referenced this pull request Jun 29, 2021
PR-URL: #39138
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
targos pushed a commit that referenced this pull request Jul 11, 2021
PR-URL: #39138
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
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 <[email protected]>
Co-authored-by: Shelley Vohr <[email protected]>
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 <[email protected]>
Co-authored-by: Shelley Vohr <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants