change the listing of the options, because there is way too much

befuddlement.
sorry jmc
ok tedu

3 files changed, 25 insertions, 26 deletions

diff --git a/usr.bin/signify/Makefile b/usr.bin/signify/Makefile
index e4765a36d70..63bd8bc0aaf 100644
--- a/usr.bin/signify/Makefile
+++ b/usr.bin/signify/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2014/01/09 19:05:43 tedu Exp $
+#	$OpenBSD: Makefile,v 1.6 2014/01/10 04:23:37 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ssh
 CPPFLAGS += -I${.CURDIR}/../ssh
@@ -7,6 +7,8 @@ SRCS=	signify.c
 SRCS+=	fe25519.c sc25519.c smult_curve25519_ref.c
 SRCS+=	mod_ed25519.c mod_ge25519.c
 SRCS+=	crypto_api.c
+.PATH: ${.CURDIR}/../../lib/libc/net
+SRCS+=	base64.c
 
 PROG=	signify
 
diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index 8d82634a539..890597d36a4 100644
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.9 2014/01/10 04:15:38 tedu Exp $
+.\" $OpenBSD: signify.1,v 1.10 2014/01/10 04:23:37 deraadt Exp $
 .\"
 .\"Copyright (c) 2013 Marc Espie <espie@openbsd.org>
 .\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
@@ -22,26 +22,26 @@
 .Nd cryptographically sign and verify files
 .Sh SYNOPSIS
 .Nm signify
+.Fl G
 .Op Fl n
 .Fl p Ar pubkey
 .Fl s Ar seckey
-.Fl G
 .Nm signify
+.Fl I
 .Op Fl o Ar signature
 .Op Fl p Ar pubkey
 .Op Fl s Ar seckey
-.Fl I
 .Nm signify
+.Fl S
 .Op Fl e
 .Op Fl o Ar output
 .Fl s Ar seckey
-.Fl S
 .Ar message
 .Nm signify
+.Fl V
 .Op Fl e
 .Op Fl o Ar output
 .Fl p Ar pubkey
-.Fl V
 .Ar message
 .Sh DESCRIPTION
 The
@@ -49,22 +49,23 @@ The
 utility creates and verifies cryptographic signatures for
 an input file
 .Ar message .
-The mode of operation is selected by the
-.Fl G ,
-.Fl S ,
-or
-.Fl V
-options.
-.Pp
-The options are as follows:
+The mode of operation is selected with the following options:
 .Bl -tag -width Dssoutput
-.It Fl e
-Embed the message after the signature when signing.
-For verification, extract the message from the signature.
 .It Fl G
 Generate a new keypair.
 .It Fl I
 Inspect the specified keys or signature and print their fingerprint.
+.It Fl S
+Sign the input file.
+.It Fl V
+Verify the input file and signature match.
+.El
+.Pp
+The other options are as follows:
+.Bl -tag -width Dssoutput
+.It Fl e
+Embed the message after the signature when signing.
+For verification, extract the message from the signature.
 .It Fl n
 Do not ask for a passphrase during key generation.
 Otherwise,
@@ -80,16 +81,12 @@ Public key produced by
 and used by
 .Fl V
 to check a signature.
-.It Fl S
-Sign the input file.
 .It Fl s Ar seckey
 Secret (private) key produced by
 .Fl G ,
 and used by
 .Fl S
 to sign a message.
-.It Fl V
-Verify the input file and signature match.
 .El
 .Pp
 The key and signature files created by
diff --git a/usr.bin/signify/signify.c b/usr.bin/signify/signify.c
index 52957c7ac18..87a4fe84239 100644
--- a/usr.bin/signify/signify.c
+++ b/usr.bin/signify/signify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signify.c,v 1.22 2014/01/10 04:15:38 tedu Exp $ */
+/* $OpenBSD: signify.c,v 1.23 2014/01/10 04:23:37 deraadt Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -72,11 +72,11 @@ usage(void)
 {
 	fprintf(stderr, "usage:"
 #ifndef VERIFYONLY
-	    "\t%s [-n] -p pubkey -s seckey -G\n"
-	    "\t%s [-o sig] [-p pubkey] [-s seckey] -I\n"
-	    "\t%s [-e] [-o output] -s seckey -S message\n"
+	    "\t%s -G [-n] -p pubkey -s seckey\n"
+	    "\t%s -I [-o sig] [-p pubkey] [-s seckey]\n"
+	    "\t%s -S [-e] [-o output] -s seckey message\n"
 #endif
-	    "\t%s [-e] [-o output] -p pubkey -V message\n",
+	    "\t%s -V [-e] [-o output] -p pubkey message\n",
 #ifndef VERIFYONLY
 	    __progname, __progname, __progname,
 #endif