diff options
author | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
commit | 242d48135a12fc9167430f391ba0d27d9ad44c6b (patch) | |
tree | 95c65b0c4b195842adfd8dcf4c10c8f46b24e044 /openssl/doc/apps/pkcs12.pod | |
parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
download | vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.gz vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.bz2 vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.zip |
Updated openssl to version 1.0.1g
Diffstat (limited to 'openssl/doc/apps/pkcs12.pod')
-rw-r--r-- | openssl/doc/apps/pkcs12.pod | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/openssl/doc/apps/pkcs12.pod b/openssl/doc/apps/pkcs12.pod index f69a5c5a4..8e0d91798 100644 --- a/openssl/doc/apps/pkcs12.pod +++ b/openssl/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 @@ -75,10 +75,15 @@ L<openssl(1)|openssl(1)>. =item B<-passout arg> -pass phrase source to encrypt any outputed private keys with. For more +pass phrase source to encrypt any outputted 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 |