summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-02-26 15:25:43 -0500
committerTomas Mraz <tmraz@fedoraproject.org>2020-03-04 11:41:50 +0100
commita8055c70fa0828636b99fe613a642a2066c0aa8b (patch)
treeda9a326f92e561cb74c66e7458dfab96cf2e80a4 /doc
parent888e2a9bf5e2cf825398b39e5cbabdbc29c71748 (diff)
downloadopenssl-new-a8055c70fa0828636b99fe613a642a2066c0aa8b.tar.gz
Add some missing env var documentation
Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11189)
Diffstat (limited to 'doc')
-rw-r--r--doc/man1/CA.pl.pod9
-rw-r--r--doc/man7/openssl-env.pod17
2 files changed, 20 insertions, 6 deletions
diff --git a/doc/man1/CA.pl.pod b/doc/man1/CA.pl.pod
index db444d5683..4c53970890 100644
--- a/doc/man1/CA.pl.pod
+++ b/doc/man1/CA.pl.pod
@@ -174,11 +174,18 @@ Sign the request:
CA.pl -signreq
+=head1 ENVIRONMENT
+
+The environment variable B<OPENSSL_CONFIG> may be used to specify a
+configuration option and value to the B<req> and B<ca> commands invoked by
+this script. It's value should be the option and pathname, as in
+C<-config /path/to/conf-file>.
+
=head1 NOTES
Most of the filenames mentioned can be modified by editing the B<CA.pl> script.
-If the demoCA directory already exists then the B<-newca> command will not
+If the F<demoCA> directory already exists then the B<-newca> command will not
overwrite it and will do nothing. This can happen if a previous call using
the B<-newca> option terminated abnormally. To get the correct behaviour
delete the demoCA directory if it already exists.
diff --git a/doc/man7/openssl-env.pod b/doc/man7/openssl-env.pod
index be89f85172..f59cd59610 100644
--- a/doc/man7/openssl-env.pod
+++ b/doc/man7/openssl-env.pod
@@ -20,15 +20,22 @@ See L<CTLOG_STORE_new(3)>.
=item B<OPENSSL>
-Specifies the path to the B<openssl> executable. Only used by
-the B<rehash> script.
-See L<openssl-rehash(1)/Script Configuration>.
+Specifies the path to the B<openssl> executable. Used by
+the B<rehash> script (see L<openssl-rehash(1)/Script Configuration>)
+and by the B<CA.pl> script (see L<CA.pl(1)/NOTES>
-=item B<OPENSSL_CONF>
+=item B<OPENSSL_CONF>, B<OPENSSL_CONF_INCLUDE>
-Specifies the path to a configuration file.
+Specifies the path to a configuration file and the directory for
+included files.
See L<openssl(1)> and L<config(5)>.
+=item B<OPENSSL_CONFIG>
+
+Specifies a configuration option and filename for the B<req> and B<ca>
+commands invoked by the B<CA.pl> script.
+See L<CA.pl(1)>.
+
=item B<OPENSSL_ENGINES>
Specifies the directory from which dynamic engines are loaded.