summaryrefslogtreecommitdiffstats
path: root/doc/man1/openssl-pkcs12.pod.in
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-08-14 21:58:34 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-08-20 14:55:34 +0200
commitb3c5aadf4ce3dc2207cc605726bf370a55b531c9 (patch)
tree5bb19360081b1ab928eb3dcede98f13caaa8ebac /doc/man1/openssl-pkcs12.pod.in
parented4faae00cdab23244704660c099e41ec64f5dc0 (diff)
apps: make use of OSSL_STORE for generalized certs and CRLs loading
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12647)
Diffstat (limited to 'doc/man1/openssl-pkcs12.pod.in')
-rw-r--r--doc/man1/openssl-pkcs12.pod.in23
1 files changed, 17 insertions, 6 deletions
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in
index 90d8a7e19e..e148d229b0 100644
--- a/doc/man1/openssl-pkcs12.pod.in
+++ b/doc/man1/openssl-pkcs12.pod.in
@@ -13,6 +13,7 @@ B<openssl> B<pkcs12>
[B<-chain>]
[B<-inkey> I<file_or_id>]
[B<-certfile> I<filename>]
+[B<-passcerts> I<arg>]
[B<-name> I<name>]
[B<-caname> I<name>]
[B<-in> I<filename>]
@@ -85,8 +86,10 @@ Print out a usage message.
=item B<-in> I<filename>
-This specifies filename of the PKCS#12 file to be parsed. Standard input is used
-by default.
+This specifies filename or URI of the PKCS#12 file to be parsed.
+With B<-export>, this refers to the the certificate and/or key input,
+which can be in PEM, DER, or PKCS#12 format.
+Standard input is used by default.
=item B<-out> I<filename>
@@ -195,9 +198,10 @@ by default.
=item B<-in> I<filename>
-The filename to read certificates and private keys from, standard input by
-default. They must all be in PEM format. The order doesn't matter but one
-private key and its corresponding certificate should be present. If additional
+The filename or URI to read certificates and private keys from, standard input
+by default. They can be in PEM, DER, or PKCS#12 format.
+The order doesn't matter but one private key and
+its corresponding certificate should be present. If additional
certificates are present they will also be included in the PKCS#12 file.
=item B<-inkey> I<file_or_id>
@@ -214,7 +218,14 @@ name is typically displayed in list boxes by software importing the file.
=item B<-certfile> I<filename>
-A filename to read additional certificates from.
+A filename or URI to read additional certificates from.
+The file can be in PEM, DER, or PKCS#12 format.
+
+=item B<-passcerts> I<arg>
+
+The password source for certificate input such as B<-certfile>.
+For more information about the format of B<arg>
+see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
=item B<-caname> I<friendlyname>