summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-01-10 04:34:25 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-01-10 04:34:25 +0000
commit94c67d9521217978f7b757c2c3cdbbf1daf86b2d (patch)
tree781c9bae3abc267eae8a7f4c0f76517f9f84b6a4
parenteabf10c5cb907a906acc24183f209cdea646972e (diff)
a little more consistent with names, notably call signature files sigfiles
for short, instead of output.
-rw-r--r--usr.bin/signify/signify.114
-rw-r--r--usr.bin/signify/signify.c8
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index 2153a0a8c58..19256bbed9c 100644
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.11 2014/01/10 04:24:18 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.12 2014/01/10 04:34:24 tedu Exp $
.\"
.\"Copyright (c) 2013 Marc Espie <espie@openbsd.org>
.\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
@@ -28,19 +28,19 @@
.Fl s Ar seckey
.Nm signify
.Fl I
-.Op Fl o Ar signature
+.Op Fl o Ar sigfile
.Op Fl p Ar pubkey
.Op Fl s Ar seckey
.Nm signify
.Fl S
.Op Fl e
-.Op Fl o Ar output
+.Op Fl o Ar sigfile
.Fl s Ar seckey
.Ar message
.Nm signify
.Fl V
.Op Fl e
-.Op Fl o Ar output
+.Op Fl o Ar sigfile
.Fl p Ar pubkey
.Ar message
.Sh DESCRIPTION
@@ -50,7 +50,7 @@ utility creates and verifies cryptographic signatures for
an input file
.Ar message .
The mode of operation is selected with the following options:
-.Bl -tag -width Dssoutput
+.Bl -tag -width Dsssigfile
.It Fl G
Generate a new keypair.
.It Fl I
@@ -62,7 +62,7 @@ Verify the input file and signature match.
.El
.Pp
The other options are as follows:
-.Bl -tag -width Dssoutput
+.Bl -tag -width Dsssignature
.It Fl e
Embed the message after the signature when signing.
For verification, extract the message from the signature.
@@ -74,7 +74,7 @@ will prompt the user for a passphrase on the terminal.
.It Fl o Ar sigfile
The signature file to create or verify.
The default is
-.Ar input Ns .sig .
+.Ar message Ns .sig .
.It Fl p Ar pubkey
Public key produced by
.Fl G ,
diff --git a/usr.bin/signify/signify.c b/usr.bin/signify/signify.c
index 87a4fe84239..ec3c4a76316 100644
--- a/usr.bin/signify/signify.c
+++ b/usr.bin/signify/signify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: signify.c,v 1.23 2014/01/10 04:23:37 deraadt Exp $ */
+/* $OpenBSD: signify.c,v 1.24 2014/01/10 04:34:24 tedu Exp $ */
/*
* Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
*
@@ -73,10 +73,10 @@ usage(void)
fprintf(stderr, "usage:"
#ifndef VERIFYONLY
"\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"
+ "\t%s -I [-o sigfile] [-p pubkey] [-s seckey]\n"
+ "\t%s -S [-e] [-o sigfile] -s seckey message\n"
#endif
- "\t%s -V [-e] [-o output] -p pubkey message\n",
+ "\t%s -V [-e] [-o sigfile] -p pubkey message\n",
#ifndef VERIFYONLY
__progname, __progname, __progname,
#endif