tweaks for openssl spkac;

1 files changed, 33 insertions, 31 deletions

diff --git a/usr.sbin/openssl/openssl.1 b/usr.sbin/openssl/openssl.1
index 561a8e0deb8..d7adc32f08c 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.45 2004/07/02 16:08:09 jmc Exp $
+.\" $OpenBSD: openssl.1,v 1.46 2004/07/23 10:35:44 jmc Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -6817,28 +6817,40 @@ benchmarks in parallel.
 .\"
 .Sh SPKAC
 .Nm openssl spkac
+.Bk -words
+.Op Fl noout
+.Op Fl pubkey
+.Op Fl verify
+.Op Fl challenge Ar string
+.Op Fl engine Ar id
 .Op Fl in Ar file
-.Op Fl out Ar file
 .Op Fl key Ar keyfile
+.Op Fl out Ar file
 .Op Fl passin Ar arg
-.Op Fl challenge Ar string
-.Op Fl pubkey
 .Op Fl spkac Ar spkacname
 .Op Fl spksect Ar section
-.Op Fl noout
-.Op Fl verify
-.Op Fl engine Ar id
+.Ek
 .Pp
 The
 .Nm spkac
 command processes Netscape signed public key and challenge
 .Pq SPKAC
 files.
-It can print out their contents, verify the signature and
-produce its own SPKACs from a supplied private key.
+It can print out their contents, verify the signature,
+and produce its own SPKACs from a supplied private key.
 .Pp
 The options are as follows:
 .Bl -tag -width "XXXX"
+.It Fl challenge Ar string
+Specifies the challenge string if an SPKAC is being created.
+.It Fl engine Ar id
+Specifying an engine (by it's unique
+.Ar id
+string) will cause
+.Nm spkac
+to attempt to obtain a functional reference to the specified engine,
+thus initialising it if needed.
+The engine will then be set as the default for all available algorithms.
 .It Fl in Ar file
 This specifies the input
 .Ar file
@@ -6846,27 +6858,31 @@ to read from, or standard input if this option is not specified.
 Ignored if the
 .Fl key
 option is used.
-.It Fl out Ar file
-Specifies the output
-.Ar file
-to write to, or standard output by default.
 .It Fl key Ar keyfile
 Create an SPKAC file using the private key in
 .Ar keyfile .
 The
-.Fl in , noout , spksect
+.Fl in , noout , spksect ,
 and
 .Fl verify
 options are ignored if present.
-.It Fl passin Ar password
+.It Fl noout
+Don't output the text version of the SPKAC
+.Pq not used if an SPKAC is being created .
+.It Fl out Ar file
+Specifies the output
+.Ar file
+to write to, or standard output by default.
+.It Fl passin Ar arg
 The input file password source.
 For more information about the format of
 .Ar arg ,
 see the
 .Sx PASS PHRASE ARGUMENTS
 section above.
-.It Fl challenge Ar string
-Specifies the challenge string if an SPKAC is being created.
+.It Fl pubkey
+Output the public key of an SPKAC
+.Pq not used if an SPKAC is being created .
 .It Fl spkac Ar spkacname
 Allows an alternative name for the variable containing the SPKAC.
 The default is "SPKAC".
@@ -6876,22 +6892,8 @@ Allows an alternative name for the
 .Ar section
 containing the SPKAC.
 The default is the default section.
-.It Fl noout
-Don't output the text version of the SPKAC
-.Pq not used if an SPKAC is being created .
-.It Fl pubkey
-Output the public key of an SPKAC
-.Pq not used if an SPKAC is being created .
 .It Fl verify
 Verifies the digital signature on the supplied SPKAC.
-.It Fl engine Ar id
-Specifying an engine (by it's unique
-.Ar id
-string) will cause
-.Nm spkac
-to attempt to obtain a functional reference to the specified engine,
-thus initialising it if needed.
-The engine will then be set as the default for all available algorithms.
 .El
 .Sh SPKAC EXAMPLES
 Print out the contents of an SPKAC: