diff options
| author | Rod Vagg <rod@vagg.org> | 2016-10-18 16:35:22 +1100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2016-10-19 14:25:23 +1100 |
| commit | bb173f931ae85b464e901806f15dcc219dec6b73 (patch) | |
| tree | c6d39a9d6fa28e87b6607b52c286ae90dc814798 /doc | |
| parent | db411cf11625ee4070a49f732aaa638bd106eb3d (diff) | |
| download | android-node-v8-bb173f931ae85b464e901806f15dcc219dec6b73.tar.gz android-node-v8-bb173f931ae85b464e901806f15dcc219dec6b73.tar.bz2 android-node-v8-bb173f931ae85b464e901806f15dcc219dec6b73.zip | |
crypto: fix openssl.cnf FIPS handling & testing
* Add documentation for `--openssl-conf=file`.
* Fix openssl.cnf loading and OpenSSL init ordering
* Fix FIPS tests so `OPENSSL_CONF` is not longer usable but
`--openssl-conf` is
PR-URL: https://github.com/nodejs/node-private/pull/82
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/cli.md | 10 | ||||
| -rw-r--r-- | doc/node.1 | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/api/cli.md b/doc/api/cli.md index 221d0c631a..13d4df49d8 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md @@ -234,6 +234,16 @@ Force FIPS-compliant crypto on startup. (Cannot be disabled from script code.) (Same requirements as `--enable-fips`) +### `--openssl-config=file` +<!-- YAML +added: v6.9.0 +--> + +Load an OpenSSL configuration file on startup. Among other uses, this can be +used to enable FIPS-compliant crypto if Node.js is built with +`./configure --openssl-fips`. + + ### `--icu-data-dir=file` <!-- YAML added: v0.11.15 diff --git a/doc/node.1 b/doc/node.1 index 43ec7c12b6..ec41a44c75 100644 --- a/doc/node.1 +++ b/doc/node.1 @@ -166,6 +166,12 @@ Force FIPS-compliant crypto on startup. (Cannot be disabled from script code.) (Same requirements as \fB\-\-enable\-fips\fR) .TP +.BR \-\-openssl\-config =\fIfile\fR +Load an OpenSSL configuration file on startup. Among other uses, this can be +used to enable FIPS-compliant crypto if Node.js is built with +\fB./configure \-\-openssl\-fips\fR. + +.TP .BR \-\-icu\-data\-dir =\fIfile\fR Specify ICU data load path. (overrides \fBNODE_ICU_DATA\fR) |