Skip to content

Commit c56a79e

Browse files
committed
squash! src: add --openssl-legacy-module option
Rename option to openssl-legacy-provider.
1 parent fde24c2 commit c56a79e

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

doc/api/cli.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,13 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be
670670
used to enable FIPS-compliant crypto if Node.js is built
671671
against FIPS-enabled OpenSSL.
672672

673-
### `--openssl-legacy-module`
673+
### `--openssl-legacy-provider`
674674
<!-- YAML
675675
added: REPLACEME
676676
-->
677677

678-
Enable OpenSSL 3.0 legacy module.
678+
Enable OpenSSL 3.0 legacy provider. For more information please see
679+
[providers readme][].
679680

680681
### `--pending-deprecation`
681682
<!-- YAML
@@ -1470,7 +1471,7 @@ Node.js options that are allowed are:
14701471
* `--no-warnings`
14711472
* `--node-memory-debug`
14721473
* `--openssl-config`
1473-
* `--openssl-legacy-module`
1474+
* `--openssl-legacy-provider`
14741475
* `--pending-deprecation`
14751476
* `--policy-integrity`
14761477
* `--preserve-symlinks-main`
@@ -1845,6 +1846,7 @@ $ node --max-old-space-size=1536 index.js
18451846
[emit_warning]: process.md#processemitwarningwarning-options
18461847
[jitless]: https://v8.dev/blog/jitless
18471848
[libuv threadpool documentation]: https://docs.libuv.org/en/latest/threadpool.html
1849+
[providers readme]: https://github.com/openssl/openssl/blob/openssl-3.0.0/README-PROVIDERS.md
18481850
[remote code execution]: https://www.owasp.org/index.php/Code_Injection
18491851
[security warning]: #warning-binding-inspector-to-a-public-ipport-combination-is-insecure
18501852
[timezone IDs]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones

src/crypto/crypto_util.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ void InitCryptoOnce() {
137137
#endif
138138

139139
#if OPENSSL_VERSION_MAJOR >= 3
140-
// --openssl-enable-legacy
141-
if (per_process::cli_options->openssl_legacy_module) {
140+
// --openssl-legacy-provider
141+
if (per_process::cli_options->openssl_legacy_provider) {
142142
OSSL_PROVIDER* legacy_provider = OSSL_PROVIDER_load(nullptr, "legacy");
143143
if (legacy_provider == nullptr) {
144144
fprintf(stderr, "Unable to load legacy provider.\n");

src/node_options.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -818,9 +818,9 @@ PerProcessOptionsParser::PerProcessOptionsParser(
818818
kAllowedInEnvironment);
819819
#endif
820820
#if OPENSSL_VERSION_MAJOR >= 3
821-
AddOption("--openssl-legacy-module",
822-
"enable OpenSSL 3.0 legacy module",
823-
&PerProcessOptions::openssl_legacy_module,
821+
AddOption("--openssl-legacy-provider",
822+
"enable OpenSSL 3.0 legacy provider",
823+
&PerProcessOptions::openssl_legacy_provider,
824824
kAllowedInEnvironment);
825825

826826
#endif // OPENSSL_VERSION_MAJOR

src/node_options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class PerProcessOptions : public Options {
257257
bool force_fips_crypto = false;
258258
#endif
259259
#if OPENSSL_VERSION_MAJOR >= 3
260-
bool openssl_legacy_module = false;
260+
bool openssl_legacy_provider = false;
261261
#endif
262262

263263
// Per-process because reports can be triggered outside a known V8 context.

test/parallel/test-process-env-allowed-flags-are-documented.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const conditionalOpts = [
4747
filter: (opt) => {
4848
return [
4949
'--openssl-config',
50-
common.hasOpenSSL3 ? '--openssl-legacy-module' : '',
50+
common.hasOpenSSL3 ? '--openssl-legacy-provider' : '',
5151
'--tls-cipher-list',
5252
'--use-bundled-ca',
5353
'--use-openssl-ca',

0 commit comments

Comments
 (0)