summaryrefslogtreecommitdiffstats
path: root/doc/man1/pkcs12.pod
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-05-20 21:44:31 -0400
committerRich Salz <rsalz@openssl.org>2017-05-21 17:20:31 -0400
commit48b5352212d8c68f7fd071ca9f38822b7e954c5a (patch)
tree0d85f3a02545caa8ddd9b4ef4268942ce36775f5 /doc/man1/pkcs12.pod
parentc80bbcbf99fa3bf7954b2ff7aa2168c3f51f3ade (diff)
-inkey can be an identifier, not just a file
update pkcs12, smime, ts apps. Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3507)
Diffstat (limited to 'doc/man1/pkcs12.pod')
-rw-r--r--doc/man1/pkcs12.pod6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod
index 80373f2034..a40ae7f04f 100644
--- a/doc/man1/pkcs12.pod
+++ b/doc/man1/pkcs12.pod
@@ -10,7 +10,7 @@ B<openssl> B<pkcs12>
[B<-help>]
[B<-export>]
[B<-chain>]
-[B<-inkey filename>]
+[B<-inkey file_or_id>]
[B<-certfile filename>]
[B<-name name>]
[B<-caname name>]
@@ -177,10 +177,12 @@ 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
certificates are present they will also be included in the PKCS#12 file.
-=item B<-inkey filename>
+=item B<-inkey file_or_id>
File to read private key from. If not present then a private key must be present
in the input file.
+If no engine is used, the argument is taken as a file; if an engine is
+specified, the argument is given to the engine as a key identifier.
=item B<-name friendlyname>