diff options
| author | Joyee Cheung <joyeec9h3@gmail.com> | 2019-02-18 13:53:12 +0800 |
|---|---|---|
| committer | Joyee Cheung <joyeec9h3@gmail.com> | 2019-02-20 23:42:11 +0800 |
| commit | 7fc6e625311fb54e3e44508c9402745fd2ad5ab8 (patch) | |
| tree | e8d613acd835e5d37cc262ee1b42606e50311aea | |
| parent | 1dc22bf3e55d5a7e1580f382231ee7af36de05aa (diff) | |
| download | android-node-v8-7fc6e625311fb54e3e44508c9402745fd2ad5ab8.tar.gz android-node-v8-7fc6e625311fb54e3e44508c9402745fd2ad5ab8.tar.bz2 android-node-v8-7fc6e625311fb54e3e44508c9402745fd2ad5ab8.zip | |
src: remove `process.binding('config').fipsForced`
Instead use `require('internal/options').getOptionValue` to
query to value of `--force-fips`.
PR-URL: https://github.com/nodejs/node/pull/26178
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
| -rw-r--r-- | lib/crypto.js | 6 | ||||
| -rw-r--r-- | src/node_config.cc | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/crypto.js b/lib/crypto.js index 97a9b14bc8..8f26ac6c13 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -37,10 +37,8 @@ const { const constants = internalBinding('constants').crypto; const { getOptionValue } = require('internal/options'); const pendingDeprecation = getOptionValue('--pending-deprecation'); -const { - fipsMode, - fipsForced -} = internalBinding('config'); +const { fipsMode } = internalBinding('config'); +const fipsForced = getOptionValue('--force-fips'); const { getFipsCrypto, setFipsCrypto } = internalBinding('crypto'); const { randomBytes, diff --git a/src/node_config.cc b/src/node_config.cc index c051e1186a..f1aa748bf5 100644 --- a/src/node_config.cc +++ b/src/node_config.cc @@ -38,9 +38,6 @@ static void Initialize(Local<Object> target, #ifdef NODE_FIPS_MODE READONLY_TRUE_PROPERTY(target, "fipsMode"); - // TODO(addaleax): Use options parser variable instead. - if (per_process::cli_options->force_fips_crypto) - READONLY_TRUE_PROPERTY(target, "fipsForced"); #endif #ifdef NODE_HAVE_I18N_SUPPORT |