From 16f8f9b03f87f266e08e1a4b7b79a112821355ae Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 23 May 2017 09:02:07 -0700 Subject: [PATCH] src: allow --tls-cipher-list in NODE_OPTIONS Backport-PR-URL: https://github.com/nodejs/node/pull/12677 PR-URL: https://github.com/nodejs/node/pull/13172 Reviewed-By: Colin Ihrig Reviewed-By: Michael Dawson Reviewed-By: Refael Ackermann Reviewed-By: James M Snell Reviewed-By: Gibson Fahnestock --- doc/api/cli.md | 1 + src/node.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/api/cli.md b/doc/api/cli.md index 8e44ed754bea59..a9941ea5d9a80a 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md @@ -356,6 +356,7 @@ Node options that are allowed are: - `--redirect-warnings` - `--require`, `-r` - `--throw-deprecation` +- `--tls-cipher-list` - `--trace-deprecation` - `--trace-sync-io` - `--trace-warnings` diff --git a/src/node.cc b/src/node.cc index 7cb4453ad2e8d8..dd49482dd442a2 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3786,7 +3786,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env, size_t arglen = eq ? eq - arg : strlen(arg); static const char* whitelist[] = { - // Node options + // Node options, sorted in `node --help` order for ease of comparison. "--require", "-r", "--debug", "--debug-brk", @@ -3802,6 +3802,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env, "--track-heap-objects", "--zero-fill-buffers", "--v8-pool-size", + "--tls-cipher-list", "--use-bundled-ca", "--use-openssl-ca", "--enable-fips",