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)
This commit is contained in:
Scott Schaefer 2013-12-23 19:01:38 +01:00 committed by Dr. Stephen Henson
parent 0071215832
commit c76e5b08a1

View File

@ -67,7 +67,7 @@ by default.
The filename to write certificates and private keys to, standard output by The filename to write certificates and private keys to, standard output by
default. They are all written in PEM format. 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 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 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 information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section
in L<openssl(1)|openssl(1)>. 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> =item B<-noout>
this option inhibits output of the keys and certificates to the output file this option inhibits output of the keys and certificates to the output file