From ffaebdf38c6a5074be3c2ab082d08331e1b2dcf8 Mon Sep 17 00:00:00 2001 From: Scott Schaefer Date: Mon, 23 Dec 2013 19:01:38 +0100 Subject: [PATCH] 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) --- doc/apps/pkcs12.pod | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 see the B section in @@ -79,6 +79,11 @@ pass phrase source to encrypt any outputed private keys with. For more information about the format of B see the B section in L. +=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 -- 2.25.1