summaryrefslogtreecommitdiffstats
path: root/doc/man1/openssl-pkcs12.pod.in
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-01-16 13:40:52 -0500
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2020-01-29 18:42:31 +0100
commit65718c516ec69ff2314d12c7ce57b242ccc3021d (patch)
tree31f951969e00d21b15659576b2dbb92f11cf76f4 /doc/man1/openssl-pkcs12.pod.in
parent62742fdd8ca46c5455441b9e5e5ddb746c8d38e2 (diff)
Document most missing options
Add cmd-nits make target. Listing options should stop when it hits the "parameters" separator. Add missing .pod.in files to doc/man1/build.info Tweak find-doc-nits to try openssl-XXX before XXX for POD files and change an error messavge to be more useful. Fix the following pages: ca, cms, crl, dgst, enc, engine, errstr, gendsa, genrsa, list, ocsp, passwd, pkcs7, pkcs12, rand, rehash, req, rsautil, s_server, speed, s_time, sess_id, smime, srp, ts, x509. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/10873)
Diffstat (limited to 'doc/man1/openssl-pkcs12.pod.in')
-rw-r--r--doc/man1/openssl-pkcs12.pod.in23
1 files changed, 21 insertions, 2 deletions
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in
index bc2f4963d5..7d562b002e 100644
--- a/doc/man1/openssl-pkcs12.pod.in
+++ b/doc/man1/openssl-pkcs12.pod.in
@@ -24,8 +24,22 @@ B<openssl> B<pkcs12>
[B<-cacerts>]
[B<-nokeys>]
[B<-info>]
-[B<-des> B<-des3> B<-idea> B<-aes128> B<-aes192> B<-aes256> B<-aria128> B<-aria192> B<-aria256> B<-camellia128> B<-camellia192> B<-camellia256> B<-nodes>]
-[B<-iter> I<count> | B<-noiter> | B<-nomaciter>]
+[B<-des>]
+[B<-des3>]
+[B<-idea>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-aria128>]
+[B<-aria192>]
+[B<-aria256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
+[B<-nodes>]
+[B<-iter> I<count>]
+[B<-noiter>]
+[B<-nomaciter>]
[B<-maciter>]
[B<-nomac>]
[B<-twopass>]
@@ -38,6 +52,7 @@ B<openssl> B<pkcs12>
[B<-password> I<arg>]
[B<-passin> I<arg>]
[B<-passout> I<arg>]
+[B<-LMK>]
[B<-CSP> I<name>]
{- $OpenSSL::safe::opt_trust_synopsis -}
{- $OpenSSL::safe::opt_r_synopsis -}
@@ -264,6 +279,10 @@ to be needed to use MAC iterations counts but they are now used by default.
Don't attempt to provide the MAC integrity.
+=item B<-LMK>
+
+Add the "Local Key Set" identifier to the attributes.
+
=item B<-CSP> I<name>
Write I<name> as a Microsoft CSP name.