diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-10 14:23:46 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-11-19 11:36:02 +0100 |
| commit | 908c9fc7ed86d8fab4edc1431433509bc18ac935 (patch) | |
| tree | d7f808b14e31fd126543655f17057a1f47377a1e /doc | |
| parent | e_loader_attic.c: Improve result handling of file_load_try_decode() (diff) | |
| download | openssl-908c9fc7ed86d8fab4edc1431433509bc18ac935.tar.xz openssl-908c9fc7ed86d8fab4edc1431433509bc18ac935.zip | |
apps/pkcs12: Clean up the order in which many options are presented
Also do a minor extension on the documentation of the -passcerts option
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man1/openssl-pkcs12.pod.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in index adcdc7c1a4..6c4fbfb563 100644 --- a/doc/man1/openssl-pkcs12.pod.in +++ b/doc/man1/openssl-pkcs12.pod.in @@ -11,9 +11,9 @@ B<openssl> B<pkcs12> [B<-help>] [B<-export>] [B<-chain>] +[B<-untrusted> I<filename>] [B<-inkey> I<file_or_id>] [B<-certfile> I<filename>] -[B<-untrusted> I<filename>] [B<-passcerts> I<arg>] [B<-name> I<name>] [B<-caname> I<name>] @@ -231,7 +231,8 @@ Any certificates that are actually part of the chain are added to the output. =item B<-passcerts> I<arg> -The password source for certificate input such as B<-certfile>. +The password source for certificate input such as B<-certfile> +and B<-untrusted>. For more information about the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. |