Google Git
Sign in
flutter/third_party/openssl/fed8bd90e4cf02066eeed9426e29d709e3630cc9^!/.
commit
fed8bd90e4cf02066eeed9426e29d709e3630cc9
[log]
author
Richard Levitte <levitte@openssl.org>
Tue Oct 01 10:00:14 2019 +0200
committer
Richard Levitte <levitte@openssl.org>
Wed Oct 09 10:41:12 2019 +0200
tree
a406909267e72b44a2ee2f987d06b74f0c0b60f8
parent
b1c0cc24564e7c8d3cd8a437585c230259584bb7 [diff]
Command docs: remove ellipses for '-rand'

Ellipses were used to express that the '-rand' value can specify
multiple files, like this:

    B<-rand> I<file...>

Because there are conventions around ellipses, this becomes confusing,
because '-rand file...' is normally intepreted to mean that
'-rand file1 file2 file3' would be processed as three randomness
files, which makes no sense.

Rather than making things complicated with more elaborate syntax, we
change it to:

    B<-rand> I<files>

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10065)

diff --git a/doc/man1/openssl-ca.pod b/doc/man1/openssl-ca.pod
index c53ba4f..4ba230f 100644
--- a/doc/man1/openssl-ca.pod
+++ b/doc/man1/openssl-ca.pod

@@ -54,7 +54,7 @@
 [B<-create_serial>]
 [B<-rand_serial>]
 [B<-multivalue-rdn>]
-[B<-rand> I<file>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-sm2-id> I<string>]
 [B<-sm2-hex-id> I<hex-string>]
@@ -293,10 +293,9 @@
 
 If -multi-rdn is not used then the UID value is I<123456+CN=John Doe>.
 
-=item B<-rand> I<file>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-cms.pod b/doc/man1/openssl-cms.pod
index d9f5a3b..1de618d 100644
--- a/doc/man1/openssl-cms.pod
+++ b/doc/man1/openssl-cms.pod

@@ -96,7 +96,7 @@
 [B<-inkey> I<file>]
 [B<-keyopt> I<name>:I<parameter>]
 [B<-passin> I<arg>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-to> I<addr>]
 [B<-from> I<addr>]
@@ -476,10 +476,9 @@
 The private key password source. For more information about the format of B<arg>
 see L<openssl(1)/Pass phrase options>.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-dgst.pod b/doc/man1/openssl-dgst.pod
index 026b42d..ebafece 100644
--- a/doc/man1/openssl-dgst.pod
+++ b/doc/man1/openssl-dgst.pod

@@ -24,7 +24,7 @@
 [B<-sigopt> I<nm>:I<v>]
 [B<-hmac> I<key>]
 [B<-fips-fingerprint>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-engine> I<id>]
 [B<-engine_impl>]
 [I<file> ...]
@@ -161,10 +161,9 @@
 The L<openssl-mac(1)> command should be preferred to using this command line
 option.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-dhparam.pod b/doc/man1/openssl-dhparam.pod
index 26b080f..79fda3d 100644
--- a/doc/man1/openssl-dhparam.pod
+++ b/doc/man1/openssl-dhparam.pod

@@ -20,7 +20,7 @@
 [B<-2>]
 [B<-3>]
 [B<-5>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 [I<numbits>]
@@ -86,10 +86,9 @@
 present but B<numbits> is present, parameters are generated with the
 default generator 2.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-dsaparam.pod b/doc/man1/openssl-dsaparam.pod
index 68e960a..133c206 100644
--- a/doc/man1/openssl-dsaparam.pod
+++ b/doc/man1/openssl-dsaparam.pod

@@ -15,7 +15,7 @@
 [B<-noout>]
 [B<-text>]
 [B<-C>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-genkey>]
 [B<-engine> I<id>]
@@ -76,10 +76,9 @@
 This option will generate a DSA either using the specified or generated
 parameters.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-ecparam.pod b/doc/man1/openssl-ecparam.pod
index bd946f1..e8de181 100644
--- a/doc/man1/openssl-ecparam.pod
+++ b/doc/man1/openssl-ecparam.pod

@@ -22,7 +22,7 @@
 [B<-conv_form> I<arg>]
 [B<-param_enc> I<arg>]
 [B<-no_seed>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-genkey>]
 [B<-engine> I<id>]
@@ -125,10 +125,9 @@
 
 This option will generate an EC private key using the specified parameters.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-enc.pod b/doc/man1/openssl-enc.pod
index 498df90..9c4954f 100644
--- a/doc/man1/openssl-enc.pod
+++ b/doc/man1/openssl-enc.pod

@@ -35,7 +35,7 @@
 [B<-nopad>]
 [B<-debug>]
 [B<-none>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 
@@ -185,10 +185,9 @@
 
 Use NULL cipher (no encryption or decryption of input).
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-gendsa.pod b/doc/man1/openssl-gendsa.pod
index a5d001a..445c176 100644
--- a/doc/man1/openssl-gendsa.pod
+++ b/doc/man1/openssl-gendsa.pod

@@ -21,7 +21,7 @@
 [B<-des>]
 [B<-des3>]
 [B<-idea>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 [B<-verbose>]
@@ -53,10 +53,9 @@
 cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified no encryption is used.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-genrsa.pod b/doc/man1/openssl-genrsa.pod
index 81ede1b..829b4a4 100644
--- a/doc/man1/openssl-genrsa.pod
+++ b/doc/man1/openssl-genrsa.pod

@@ -24,7 +24,7 @@
 [B<-idea>]
 [B<-f4>]
 [B<-3>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 [B<-primes> I<num>]
@@ -66,10 +66,9 @@
 
 The public exponent to use, either 65537 or 3. The default is 65537.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-passwd.pod b/doc/man1/openssl-passwd.pod
index 755e80a..a312030 100644
--- a/doc/man1/openssl-passwd.pod
+++ b/doc/man1/openssl-passwd.pod

@@ -20,7 +20,7 @@
 [B<-noverify>]
 [B<-quiet>]
 [B<-table>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 {I<password>}
 
@@ -92,10 +92,9 @@
 In the output list, prepend the cleartext password and a TAB character
 to each password hash.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-pkcs12.pod b/doc/man1/openssl-pkcs12.pod
index f309bcd..72f601a 100644
--- a/doc/man1/openssl-pkcs12.pod
+++ b/doc/man1/openssl-pkcs12.pod

@@ -36,7 +36,7 @@
 [B<-password> I<arg>]
 [B<-passin> I<arg>]
 [B<-passout> I<arg>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-CAfile> I<file>]
 [B<-CApath> I<dir>]
@@ -280,10 +280,9 @@
 
 Don't attempt to provide the MAC integrity.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-pkcs8.pod b/doc/man1/openssl-pkcs8.pod
index e1cc0b3..1dcda10 100644
--- a/doc/man1/openssl-pkcs8.pod
+++ b/doc/man1/openssl-pkcs8.pod

@@ -17,7 +17,7 @@
 [B<-passout> I<arg>]
 [B<-iter> I<count>]
 [B<-noiter>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-nocrypt>]
 [B<-traditional>]
@@ -105,10 +105,9 @@
 when absolutely necessary. Certain software such as some versions of Java
 code signing software used unencrypted private keys.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-pkeyutl.pod b/doc/man1/openssl-pkeyutl.pod
index a0f4555..3532fa6 100644
--- a/doc/man1/openssl-pkeyutl.pod
+++ b/doc/man1/openssl-pkeyutl.pod

@@ -33,7 +33,7 @@
 [B<-pkeyopt_passin> I<opt:passarg>]
 [B<-hexdump>]
 [B<-asn1parse>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 [B<-engine_impl>]
@@ -177,10 +177,9 @@
 Parse the ASN.1 output data, this is useful when combined with the
 B<-verifyrecover> option when an ASN1 structure is signed.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-rand.pod b/doc/man1/openssl-rand.pod
index 4d57265..ca62afb 100644
--- a/doc/man1/openssl-rand.pod
+++ b/doc/man1/openssl-rand.pod

@@ -9,7 +9,7 @@
 B<openssl rand>
 [B<-help>]
 [B<-out> I<file>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-base64>]
 [B<-hex>]
@@ -38,10 +38,9 @@
 
 Write to I<file> instead of standard output.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-req.pod b/doc/man1/openssl-req.pod
index e010e00..30c339b 100644
--- a/doc/man1/openssl-req.pod
+++ b/doc/man1/openssl-req.pod

@@ -20,7 +20,7 @@
 [B<-verify>]
 [B<-modulus>]
 [B<-new>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-newkey> I<rsa:bits>]
 [B<-newkey> I<alg:file>]
@@ -142,10 +142,9 @@
 If the B<-key> option is not used it will generate a new RSA private
 key using information specified in the configuration file.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-rsautl.pod b/doc/man1/openssl-rsautl.pod
index fccd7a1..9c2f657 100644
--- a/doc/man1/openssl-rsautl.pod
+++ b/doc/man1/openssl-rsautl.pod

@@ -18,7 +18,7 @@
 [B<-verify>]
 [B<-encrypt>]
 [B<-decrypt>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-pkcs>]
 [B<-ssl>]
@@ -84,10 +84,9 @@
 
 Decrypt the input data using an RSA private key.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-s_client.pod b/doc/man1/openssl-s_client.pod
index 3baacd3..ddf3f48 100644
--- a/doc/man1/openssl-s_client.pod
+++ b/doc/man1/openssl-s_client.pod

@@ -125,7 +125,7 @@
 [B<-no_ticket>]
 [B<-sess_out> I<filename>]
 [B<-sess_in> I<filename>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-serverinfo> I<types>]
 [B<-status>]
@@ -673,10 +673,9 @@
 thus initialising it if needed. The engine will then be set as the default
 for all available algorithms.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-s_server.pod b/doc/man1/openssl-s_server.pod
index 69275ed..8c3e790 100644
--- a/doc/man1/openssl-s_server.pod
+++ b/doc/man1/openssl-s_server.pod

@@ -52,7 +52,7 @@
 [B<-tlsextdebug>]
 [B<-HTTP>]
 [B<-id_prefix> I<val>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-keymatexport> I<val>]
 [B<-keymatexportlen> I<+int>]
@@ -446,10 +446,9 @@
 servers, when each of which might be generating a unique range of session
 IDs (eg. with a certain prefix).
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-smime.pod b/doc/man1/openssl-smime.pod
index 84549c4..5fbbcae 100644
--- a/doc/man1/openssl-smime.pod
+++ b/doc/man1/openssl-smime.pod

@@ -65,7 +65,7 @@
 [B<-indef>]
 [B<-noindef>]
 [B<-stream>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-md> I<digest>]
 I<cert.pem> ...
@@ -298,10 +298,9 @@
 The private key password source. For more information about the format of B<arg>
 see L<openssl(1)/Pass phrase options>.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-speed.pod b/doc/man1/openssl-speed.pod
index 9216cd4..cd64684 100644
--- a/doc/man1/openssl-speed.pod
+++ b/doc/man1/openssl-speed.pod

@@ -14,7 +14,7 @@
 [B<-hmac> I<algo>]
 [B<-cmac> I<algo>]
 [B<-decrypt>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-primes> I<num>]
 [B<-seconds> I<num>]
@@ -70,10 +70,9 @@
 
 Time the decryption instead of encryption. Affects only the EVP testing.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-srp.pod b/doc/man1/openssl-srp.pod
index 7504f88..0323940 100644
--- a/doc/man1/openssl-srp.pod
+++ b/doc/man1/openssl-srp.pod

@@ -17,7 +17,7 @@
 [B<-config> I<file>]
 [B<-srpvfile> I<file>]
 [B<-gn> I<identifier>]
-[B<-userinfo> I<text...>]
+[B<-userinfo> I<text>]
 [B<-passin> I<arg>]
 [B<-passout> I<arg>]
 [I<user> ...]

diff --git a/doc/man1/openssl-ts.pod b/doc/man1/openssl-ts.pod
index 4090645..d9dd7e4 100644
--- a/doc/man1/openssl-ts.pod
+++ b/doc/man1/openssl-ts.pod

@@ -8,7 +8,7 @@
 
 B<openssl> B<ts>
 B<-query>
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-config> I<configfile>]
 [B<-data> I<file_to_hash>]
@@ -134,10 +134,9 @@
 
 =over 4
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl-x509.pod b/doc/man1/openssl-x509.pod
index 99d06d0..bd653ed 100644
--- a/doc/man1/openssl-x509.pod
+++ b/doc/man1/openssl-x509.pod

@@ -63,7 +63,7 @@
 [B<-extfile> I<filename>]
 [B<-extensions> I<section>]
 [B<-sigopt> I<nm>:I<v>]
-[B<-rand> I<file...>]
+[B<-rand> I<files>]
 [B<-writerand> I<file>]
 [B<-engine> I<id>]
 [B<-preserve_dates>]
@@ -122,10 +122,9 @@
 If not specified then SHA1 is used with B<-fingerprint> or
 the default digest for the signing algorithm is used, typically SHA256.
 
-=item B<-rand> I<file...>
+=item B<-rand> I<files>
 
-A file or files containing random data used to seed the random number
-generator.
+The files containing random data used to seed the random number generator.
 Multiple files can be specified separated by an OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index dade253..baa7bde 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod

@@ -549,7 +549,7 @@
 
 =over 4
 
-=item B<OPENSSL_TRACE=>I<name,...>
+=item B<OPENSSL_TRACE=>I<name>[,...]
 
 Enable tracing output of OpenSSL library, by name.
 This output will only make sense if you know OpenSSL internals well.