aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-05-17 11:38:01 +0200
committerDr. David von Oheimb <dev@ddvo.net>2021-05-18 13:02:41 +0200
commit78c44e4f819721eb80ad95fddc360a34f9e93118 (patch)
treed91e3ba9bedcb72d134c9e66311ab7f2aea93b3a
parent4a14ae9dc885076028cc4ec69af07b9d99fe9044 (diff)
downloadopenssl-78c44e4f819721eb80ad95fddc360a34f9e93118.tar.gz
DOC: Fix nits found by improved find-doc-nits -c
Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15298)
-rw-r--r--apps/list.c4
-rw-r--r--doc/man1/openssl-cms.pod.in8
-rw-r--r--doc/man1/openssl-dsa.pod.in15
-rw-r--r--doc/man1/openssl-list.pod.in15
-rw-r--r--doc/man1/openssl-rsa.pod.in15
5 files changed, 55 insertions, 2 deletions
diff --git a/apps/list.c b/apps/list.c
index bf7c9b1049..37e363ebd1 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -1470,7 +1470,7 @@ const OPTIONS list_options[] = {
{"kdf-algorithms", OPT_KDF_ALGORITHMS, '-',
"List of key derivation and pseudo random function algorithms"},
{"random-instances", OPT_RANDOM_INSTANCES, '-',
- "List the primary, pubic and private random number generator details"},
+ "List the primary, public and private random number generator details"},
{"random-generators", OPT_RANDOM_GENERATORS, '-',
"List of random number generators"},
{"mac-algorithms", OPT_MAC_ALGORITHMS, '-',
@@ -1490,7 +1490,7 @@ const OPTIONS list_options[] = {
"List of key encapsulation mechanism algorithms" },
{"signature-algorithms", OPT_SIGNATURE_ALGORITHMS, '-',
"List of signature algorithms" },
- { "asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
+ {"asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
"List of asymmetric cipher algorithms" },
{"public-key-algorithms", OPT_PK_ALGORITHMS, '-',
"List of public key algorithms"},
diff --git a/doc/man1/openssl-cms.pod.in b/doc/man1/openssl-cms.pod.in
index 0ec906cbc1..5263a5d5be 100644
--- a/doc/man1/openssl-cms.pod.in
+++ b/doc/man1/openssl-cms.pod.in
@@ -48,6 +48,10 @@ B<openssl> B<cms>
[B<-md> I<digest>]
[B<-I<cipher>>]
[B<-wrap> I<cipher>]
+[B<-aes128-wrap>]
+[B<-aes192-wrap>]
+[B<-aes256-wrap>]
+[B<-des3-wrap>]
[B<-nointern>]
[B<-noverify>]
[B<-nocerts>]
@@ -322,6 +326,10 @@ Cipher algorithm to use for key wrap when encrypting the message using Key
Agreement for key transport. The algorithm specified should be suitable for key
wrap.
+=item B<-aes128-wrap>, B<-aes192-wrap>, B<-aes256-wrap>, B<-des3-wrap>
+
+Use AES128, AES192, AES256, or 3DES-EDE, respectively, to wrap key.
+
=item B<-nointern>
When verifying a message normally certificates (if any) included in
diff --git a/doc/man1/openssl-dsa.pod.in b/doc/man1/openssl-dsa.pod.in
index 3450ebf4f4..494cfe8635 100644
--- a/doc/man1/openssl-dsa.pod.in
+++ b/doc/man1/openssl-dsa.pod.in
@@ -36,6 +36,9 @@ B<openssl> B<dsa>
[B<-modulus>]
[B<-pubin>]
[B<-pubout>]
+[B<-pvk-strong>]
+[B<-pvk-weak>]
+[B<-pvk-none>]
{- $OpenSSL::safe::opt_engine_synopsis -}{- $OpenSSL::safe::opt_provider_synopsis -}
=for openssl ifdef pvk-strong pvk-weak pvk-none engine
@@ -123,6 +126,18 @@ By default, a private key is output. With this option a public
key will be output instead. This option is automatically set if the input is
a public key.
+=item B<-pvk-strong>
+
+Enable 'Strong' PVK encoding level (default).
+
+=item B<-pvk-weak>
+
+Enable 'Weak' PVK encoding level.
+
+=item B<-pvk-none>
+
+Don't enforce PVK encoding.
+
{- $OpenSSL::safe::opt_engine_item -}
{- $OpenSSL::safe::opt_provider_item -}
diff --git a/doc/man1/openssl-list.pod.in b/doc/man1/openssl-list.pod.in
index 74389dca23..2b05fa74d4 100644
--- a/doc/man1/openssl-list.pod.in
+++ b/doc/man1/openssl-list.pod.in
@@ -13,12 +13,14 @@ B<openssl list>
[B<-select> I<name>]
[B<-1>]
[B<-commands>]
+[B<-standard-commands>]
[B<-digest-algorithms>]
{- output_off() if $disabled{"deprecated-3.0"}; ""
-}[B<-digest-commands>]
{- output_on() if $disabled{"deprecated-3.0"}; ""
-}[B<-kdf-algorithms>]
[B<-mac-algorithms>]
+[B<-random-instances>]
[B<-random-generators>]
[B<-cipher-algorithms>]
{- output_off() if $disabled{"deprecated-3.0"}; ""
@@ -38,6 +40,7 @@ B<openssl list>
-}[B<-engines>]
{- output_on() if $disabled{"deprecated-3.0"}; ""
-}[B<-disabled>]
+[B<-missing-help>]
[B<-objects>]
[B<-options> I<command>]
{- $OpenSSL::safe::opt_provider_synopsis -}
@@ -73,6 +76,10 @@ If used, this option must be given first.
Display a list of standard commands.
+=item B<-standard-commands>
+
+List of standard commands.
+
=item B<-digest-commands>
This option is deprecated. Use B<digest-algorithms> instead.
@@ -97,6 +104,10 @@ displayed.
In verbose mode, the algorithms provided by a provider will get additional
information on what parameters each implementation supports.
+=item B<-random-instances>
+
+List the primary, public and private random number generator details.
+
=item B<-random-generators>
Display a list of random number generators.
@@ -171,6 +182,10 @@ Display a list of loaded engines.
Display a list of disabled features, those that were compiled out
of the installation.
+=item B<-missing-help>
+
+List missing detailed help strings.
+
=item B<-objects>
Display a list of built in objects, i.e. OIDs with names. They're listed in the
diff --git a/doc/man1/openssl-rsa.pod.in b/doc/man1/openssl-rsa.pod.in
index fab6408f14..286766e72f 100644
--- a/doc/man1/openssl-rsa.pod.in
+++ b/doc/man1/openssl-rsa.pod.in
@@ -40,6 +40,9 @@ B<openssl> B<rsa>
[B<-pubout>]
[B<-RSAPublicKey_in>]
[B<-RSAPublicKey_out>]
+[B<-pvk-strong>]
+[B<-pvk-weak>]
+[B<-pvk-none>]
{- $OpenSSL::safe::opt_engine_synopsis -}{- $OpenSSL::safe::opt_provider_synopsis -}
=for openssl ifdef pvk-strong pvk-weak pvk-none engine
@@ -133,6 +136,18 @@ the input is a public key.
Like B<-pubin> and B<-pubout> except B<RSAPublicKey> format is used instead.
+=item B<-pvk-strong>
+
+Enable 'Strong' PVK encoding level (default).
+
+=item B<-pvk-weak>
+
+Enable 'Weak' PVK encoding level.
+
+=item B<-pvk-none>
+
+Don't enforce PVK encoding.
+
{- $OpenSSL::safe::opt_engine_item -}
{- $OpenSSL::safe::opt_provider_item -}