summaryrefslogtreecommitdiff
path: root/doc/node.1
diff options
context:
space:
mode:
authorRod Vagg <rod@vagg.org>2016-10-18 16:35:22 +1100
committerRod Vagg <rod@vagg.org>2016-10-19 14:25:23 +1100
commitbb173f931ae85b464e901806f15dcc219dec6b73 (patch)
treec6d39a9d6fa28e87b6607b52c286ae90dc814798 /doc/node.1
parentdb411cf11625ee4070a49f732aaa638bd106eb3d (diff)
downloadandroid-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/node.1')
-rw-r--r--doc/node.16
1 files changed, 6 insertions, 0 deletions
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)