summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjmc <>2016-08-08 18:13:51 +0000
committerjmc <>2016-08-08 18:13:51 +0000
commitf3fe85e3ec23409ecae083e35a8314a50fb87c5d (patch)
tree65159ea416b7aa1996f21fdb5f1df853bf4a557b /src
parent6d9e31c685cdac8d6a067ddaed8712bed776ef5a (diff)
downloadopenbsd-f3fe85e3ec23409ecae083e35a8314a50fb87c5d.tar.gz
openbsd-f3fe85e3ec23409ecae083e35a8314a50fb87c5d.tar.bz2
openbsd-f3fe85e3ec23409ecae083e35a8314a50fb87c5d.zip
trim the dsaparam section; ok guenther
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/openssl.192
1 files changed, 36 insertions, 56 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index cd0b057ac0..e30510ef7d 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: openssl.1,v 1.45 2016/08/05 08:12:12 jmc Exp $ 1.\" $OpenBSD: openssl.1,v 1.46 2016/08/08 18:13:51 jmc Exp $
2.\" ==================================================================== 2.\" ====================================================================
3.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4.\" 4.\"
@@ -112,7 +112,7 @@
112.\" 112.\"
113.\" OPENSSL 113.\" OPENSSL
114.\" 114.\"
115.Dd $Mdocdate: August 5 2016 $ 115.Dd $Mdocdate: August 8 2016 $
116.Dt OPENSSL 1 116.Dt OPENSSL 1
117.Os 117.Os
118.Sh NAME 118.Sh NAME
@@ -261,7 +261,7 @@ The input format.
261.It Fl length Ar number 261.It Fl length Ar number
262Number of bytes to parse; the default is until end of file. 262Number of bytes to parse; the default is until end of file.
263.It Fl noout 263.It Fl noout
264Don't output the parsed version of the input file. 264Do not output the parsed version of the input file.
265.It Fl offset Ar number 265.It Fl offset Ar number
266Starting offset to begin parsing; the default is start of file. 266Starting offset to begin parsing; the default is start of file.
267.It Fl oid Ar file 267.It Fl oid Ar file
@@ -1009,7 +1009,7 @@ Output the
1009.Cm nextUpdate 1009.Cm nextUpdate
1010field. 1010field.
1011.It Fl noout 1011.It Fl noout
1012Don't output the encoded version of the CRL. 1012Do not output the encoded version of the CRL.
1013.It Fl out Ar file 1013.It Fl out Ar file
1014The output file to write to, or standard output if not specified. 1014The output file to write to, or standard output if not specified.
1015.It Fl outform Cm der | pem 1015.It Fl outform Cm der | pem
@@ -1239,7 +1239,7 @@ additional header and footer lines:
1239-----END DH PARAMETERS----- 1239-----END DH PARAMETERS-----
1240.Ed 1240.Ed
1241.It Fl noout 1241.It Fl noout
1242Inhibit the output of the encoded version of the parameters. 1242Do not output the encoded version of the parameters.
1243.It Fl out Ar file 1243.It Fl out Ar file
1244The output file to write to, 1244The output file to write to,
1245or standard output if not specified. 1245or standard output if not specified.
@@ -1341,7 +1341,7 @@ In the case of a private key, PKCS#8 format is also accepted.
1341.It Fl modulus 1341.It Fl modulus
1342Print the value of the public key component of the key. 1342Print the value of the public key component of the key.
1343.It Fl noout 1343.It Fl noout
1344Prevent output of the encoded version of the key. 1344Do not output the encoded version of the key.
1345.It Fl out Ar file 1345.It Fl out Ar file
1346The output file to write to, 1346The output file to write to,
1347or standard output if not specified. 1347or standard output if not specified.
@@ -1363,90 +1363,70 @@ This option is automatically set if the input is a public key.
1363.It Fl text 1363.It Fl text
1364Print out the public/private key components and parameters. 1364Print out the public/private key components and parameters.
1365.El 1365.El
1366.\"
1367.\" DSAPARAM
1368.\"
1369.Sh DSAPARAM 1366.Sh DSAPARAM
1370.nr nS 1 1367.nr nS 1
1371.Nm "openssl dsaparam" 1368.Nm "openssl dsaparam"
1372.Bk -words
1373.Op Fl C 1369.Op Fl C
1374.Op Fl genkey 1370.Op Fl genkey
1375.Op Fl in Ar file 1371.Op Fl in Ar file
1376.Op Fl inform Ar DER | PEM 1372.Op Fl inform Cm der | pem
1377.Op Fl noout 1373.Op Fl noout
1378.Op Fl out Ar file 1374.Op Fl out Ar file
1379.Op Fl outform Ar DER | PEM 1375.Op Fl outform Cm der | pem
1380.Op Fl text 1376.Op Fl text
1381.Op Ar numbits 1377.Op Ar numbits
1382.Ek
1383.nr nS 0 1378.nr nS 0
1384.Pp 1379.Pp
1385The 1380The
1386.Nm dsaparam 1381.Nm dsaparam
1387command is used to manipulate or generate DSA parameter files. 1382command is used to manipulate or generate DSA parameter files.
1388.Pp 1383.Pp
1384PEM format DSA parameters use the header and footer lines:
1385.Bd -unfilled -offset indent
1386-----BEGIN DSA PARAMETERS-----
1387-----END DSA PARAMETERS-----
1388.Ed
1389.Pp
1389The options are as follows: 1390The options are as follows:
1390.Bl -tag -width Ds 1391.Bl -tag -width Ds
1391.It Fl C 1392.It Fl C
1392This option converts the parameters into C code. 1393Convert the parameters into C code.
1393The parameters can then be loaded by calling the 1394The parameters can then be loaded by calling the
1394.Cm get_dsa Ns Ar XXX Ns Li () 1395.No get_dsa Ns Ar XXX
1395function. 1396function.
1396.It Fl genkey 1397.It Fl genkey
1397This option will generate a DSA either using the specified or generated 1398Generate a DSA key either using the specified or generated
1398parameters. 1399parameters.
1399.It Fl in Ar file 1400.It Fl in Ar file
1400This specifies the input 1401The input file to read from,
1401.Ar file 1402or standard input if not specified.
1402to read parameters from, or standard input if this option is not specified.
1403If the 1403If the
1404.Ar numbits 1404.Ar numbits
1405parameter is included, then this option will be ignored. 1405parameter is included, then this option is ignored.
1406.It Fl inform Ar DER | PEM 1406.It Fl inform Cm der | pem
1407This specifies the input format. 1407The input format.
1408The 1408.Cm der
1409.Ar DER 1409uses an ASN1 DER-encoded form compatible with RFC 2459
1410argument uses an ASN1 DER-encoded form compatible with RFC 2459
1411.Pq PKIX 1410.Pq PKIX
1412DSS-Parms that is a SEQUENCE consisting of p, q and g, respectively. 1411DSS-Parms that is a SEQUENCE consisting of p, q and g, respectively.
1413The 1412.Cm pem
1414.Ar PEM 1413is the default format:
1415form is the default format:
1416it consists of the DER format base64-encoded with additional header 1414it consists of the DER format base64-encoded with additional header
1417and footer lines. 1415and footer lines.
1418.It Fl noout 1416.It Fl noout
1419This option inhibits the output of the encoded version of the parameters. 1417Do not output the encoded version of the parameters.
1420.It Ar numbits
1421This option specifies that a parameter set should be generated of size
1422.Ar numbits .
1423If this option is included, the input file
1424.Pq if any
1425is ignored.
1426.It Fl out Ar file 1418.It Fl out Ar file
1427This specifies the output 1419The output file to write to,
1428.Ar file 1420or standard output if not specified.
1429to write parameters to. 1421.It Fl outform Cm der | pem
1430Standard output is used if this option is not present. 1422The output format.
1431The output filename should
1432.Em not
1433be the same as the input filename.
1434.It Fl outform Ar DER | PEM
1435This specifies the output format; the options have the same meaning as the
1436.Fl inform
1437option.
1438.It Fl text 1423.It Fl text
1439This option prints out the DSA parameters in human readable form. 1424Print the DSA parameters in human readable form.
1425.It Ar numbits
1426Generate a parameter set of size
1427.Ar numbits .
1428If this option is included, the input file is ignored.
1440.El 1429.El
1441.Sh DSAPARAM NOTES
1442PEM format DSA parameters use the header and footer lines:
1443.Bd -unfilled -offset indent
1444-----BEGIN DSA PARAMETERS-----
1445-----END DSA PARAMETERS-----
1446.Ed
1447.Pp
1448DSA parameter generation is a slow process and as a result the same set of
1449DSA parameters is often used to generate several distinct keys.
1450.\" 1430.\"
1451.\" EC 1431.\" EC
1452.\" 1432.\"