diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-11 19:07:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-11 19:07:45 +0000 |
| commit | 5c266cb7c932e78233437385fe6993499ad9e2ea (patch) | |
| tree | fb5b3a19a5d9e924a0f43b0ef4999a09e22aa1b4 /secure/usr.bin/openssl/man/dhparam.1 | |
| parent | 3a6c5b791fafa79766a5c99c288a7d1ef495157a (diff) | |
| download | FreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.zip FreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.tar.gz | |
MFC: r284283
Merge OpenSSL 1.0.1n.
Diffstat (limited to 'secure/usr.bin/openssl/man/dhparam.1')
| -rw-r--r-- | secure/usr.bin/openssl/man/dhparam.1 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/secure/usr.bin/openssl/man/dhparam.1 b/secure/usr.bin/openssl/man/dhparam.1 index d377080..3359d4b 100644 --- a/secure/usr.bin/openssl/man/dhparam.1 +++ b/secure/usr.bin/openssl/man/dhparam.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.30) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "DHPARAM 1" -.TH DHPARAM 1 "2015-03-19" "1.0.1m" "OpenSSL" +.TH DHPARAM 1 "2015-06-11" "1.0.1n" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -197,8 +197,10 @@ avoid small-subgroup attacks that may be possible otherwise. check if the parameters are valid primes and generator. .IP "\fB\-2\fR, \fB\-5\fR" 4 .IX Item "-2, -5" -The generator to use, either 2 or 5. 2 is the default. If present then the -input file is ignored and parameters are generated instead. +The generator to use, either 2 or 5. If present then the +input file is ignored and parameters are generated instead. If not +present but \fBnumbits\fR is present, parameters are generated with the +default generator 2. .IP "\fB\-rand\fR \fIfile(s)\fR" 4 .IX Item "-rand file(s)" a file or files containing random data used to seed the random number @@ -209,9 +211,10 @@ all others. .IP "\fInumbits\fR" 4 .IX Item "numbits" this option specifies that a parameter set should be generated of size -\&\fInumbits\fR. It must be the last option. If not present then a value of 512 -is used. If this option is present then the input file is ignored and -parameters are generated instead. +\&\fInumbits\fR. It must be the last option. If this option is present then +the input file is ignored and parameters are generated instead. If +this option is not present but a generator (\fB\-2\fR or \fB\-5\fR) is +present, parameters are generated with a default length of 2048 bits. .IP "\fB\-noout\fR" 4 .IX Item "-noout" this option inhibits the output of the encoded version of the parameters. |
