summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Schaefer <saschaefer@neurodiverse.org>2013-12-23 19:01:38 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-02-14 22:35:39 +0000
commitc76e5b08a151a48fde67b2d3e6fe54ae8af901d7 (patch)
tree72e42c68eb702cb07ef67cc7c78d82d849ff7d3a
parent0071215832e09c77f62193cec8f00db22854f3b8 (diff)
downloadopenssl-new-c76e5b08a151a48fde67b2d3e6fe54ae8af901d7.tar.gz
Document pkcs12 -password behavior
apps/pkcs12.c accepts -password as an argument. The document author almost certainly meant to write "-password, -passin". However, that is not correct, either. Actually the code treats -password as equivalent to -passin, EXCEPT when -export is also specified, in which case -password as equivalent to -passout. (cherry picked from commit 856c6dfb09d69fc82ada2611c6cd792dfc60e355)
-rw-r--r--doc/apps/pkcs12.pod7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod
index f69a5c5a4c..13392b9b06 100644
--- a/doc/apps/pkcs12.pod
+++ b/doc/apps/pkcs12.pod
@@ -67,7 +67,7 @@ by default.
The filename to write certificates and private keys to, standard output by
default. They are all written in PEM format.
-=item B<-pass arg>, B<-passin arg>
+=item B<-passin arg>
the PKCS#12 file (i.e. input file) password source. For more information about
the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
@@ -79,6 +79,11 @@ pass phrase source to encrypt any outputed private keys with. For more
information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
in L<openssl(1)|openssl(1)>.
+=item B<-password arg>
+
+With -export, -password is equivalent to -passout.
+Otherwise, -password is equivalent to -passin.
+
=item B<-noout>
this option inhibits output of the keys and certificates to the output file