Skip to content

crypto: fix setEngine() when OPENSSL_NO_ENGINE set - #47977

Merged
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
tniessen:crypto-fix-setengine-no-engine
May 15, 2023
Merged

crypto: fix setEngine() when OPENSSL_NO_ENGINE set#47977
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
tniessen:crypto-fix-setengine-no-engine

Conversation

@tniessen

@tniessentniessen commented May 12, 2023

Copy link
Copy Markdown
Member

When OpenSSL is configured with OPENSSL_NO_ENGINE, setEngine() currently throws an internal error because the C++ binding does not export the relevant function, which causes _setEngine() to be undefined within JS.

Instead, match the behavior of tls/secure-context.js and throw the existing error code ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED when OpenSSL has been configured with OPENSSL_NO_ENGINE.

For reference:

node/lib/internal/tls/secure-context.js

Lines 202 to 205 in 7984af6

if(context.setEngineKey)
context.setEngineKey(privateKeyIdentifier,privateKeyEngine);
else
thrownewERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED();

node/lib/internal/tls/secure-context.js

Lines 285 to 288 in 7984af6

if(typeofcontext.setClientCertEngine!=='function')
thrownewERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED();
else
context.setClientCertEngine(clientCertEngine);

@tniessen
crypto: fix setEngine() when OPENSSL_NO_ENGINE set
742bd83
When OpenSSL is configured with OPENSSL_NO_ENGINE, setEngine() currently
throws an internal error because the C++ binding does not export the
relevant function, which causes _setEngine() to be undefined within JS.
Instead, match the behavior of tls/secure-context.js and throw the
existing error code ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED when OpenSSL
has been configured with OPENSSL_NO_ENGINE.
@tniessentniessen added crypto Issues and PRs related to the crypto subsystem. openssl Issues and PRs related to the OpenSSL dependency. labels May 12, 2023
@nodejs-github-bot

nodejs-github-bot commented May 12, 2023

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/crypto

@nodejs-github-botnodejs-github-bot added the needs-ci PRs that need a full CI run. label May 12, 2023
@tniessentniessen added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels May 12, 2023
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 12, 2023
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@github-actionsgithub-actionsBot mentioned this pull request May 14, 2023
Open
14 tasks
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@github-actionsgithub-actionsBot mentioned this pull request May 15, 2023
Open
17 tasks
@nodejs-github-bot

nodejs-github-bot commented May 15, 2023

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/51813/

@tniessentniessen added the commit-queue Add this label to land a pull request using GitHub Actions. label May 15, 2023
@nodejs-github-botnodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label May 15, 2023
@nodejs-github-bot
nodejs-github-bot merged commit 5b4c7bd into nodejs:mainMay 15, 2023
@nodejs-github-bot

nodejs-github-bot commented May 15, 2023

Copy link
Copy Markdown
Collaborator

Landed in 5b4c7bd

This was referenced May 16, 2023
Open
Open
Open
Open
targos pushed a commit that referenced this pull request May 30, 2023
@tniessen@targos
crypto: fix setEngine() when OPENSSL_NO_ENGINE set
15c2de4
When OpenSSL is configured with OPENSSL_NO_ENGINE, setEngine() currently
throws an internal error because the C++ binding does not export the
relevant function, which causes _setEngine() to be undefined within JS.
Instead, match the behavior of tls/secure-context.js and throw the
existing error code ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED when OpenSSL
has been configured with OPENSSL_NO_ENGINE.
PR-URL: #47977
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
@targostargos mentioned this pull request Jun 4, 2023
Merged
danielleadams pushed a commit that referenced this pull request Jul 6, 2023
@tniessen@danielleadams
crypto: fix setEngine() when OPENSSL_NO_ENGINE set
9d69843
When OpenSSL is configured with OPENSSL_NO_ENGINE, setEngine() currently
throws an internal error because the C++ binding does not export the
relevant function, which causes _setEngine() to be undefined within JS.
Instead, match the behavior of tls/secure-context.js and throw the
existing error code ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED when OpenSSL
has been configured with OPENSSL_NO_ENGINE.
PR-URL: #47977
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
MoLow pushed a commit to MoLow/node that referenced this pull request Jul 6, 2023
@tniessen@MoLow
crypto: fix setEngine() when OPENSSL_NO_ENGINE set
8cabfe7
When OpenSSL is configured with OPENSSL_NO_ENGINE, setEngine() currently
throws an internal error because the C++ binding does not export the
relevant function, which causes _setEngine() to be undefined within JS.
Instead, match the behavior of tls/secure-context.js and throw the
existing error code ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED when OpenSSL
has been configured with OPENSSL_NO_ENGINE.
PR-URL: nodejs#47977
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
@danielleadamsdanielleadams mentioned this pull request Jul 10, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@panvapanvapanva approved these changes
@bnoordhuisbnoordhuisbnoordhuis approved these changes
@lpincalpincalpinca approved these changes
@richardlaurichardlaurichardlau approved these changes

Assignees

No one assigned

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.cryptoIssues and PRs related to the crypto subsystem.needs-ciPRs that need a full CI run.opensslIssues and PRs related to the OpenSSL dependency.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tniessen@nodejs-github-bot@panva@bnoordhuis@lpinca@richardlau