aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--file/file.go2
-rw-r--r--main.go27
-rw-r--r--sign.go2
-rw-r--r--verify.go2
4 files changed, 24 insertions, 9 deletions
diff --git a/file/file.go b/file/file.go
index b55111f..b44f3b5 100644
--- a/file/file.go
+++ b/file/file.go
@@ -30,7 +30,7 @@ var ErrComment = errors.New("expected untrusted comment")
type Block struct {
Comment string
Bytes []byte
- Message []byte // TODO replace with io.Reader
+ Message []byte // TODO replace with io.ReadCloser
}
func Encode(w io.Writer, b *Block) error {
diff --git a/main.go b/main.go
index e782051..8000e08 100644
--- a/main.go
+++ b/main.go
@@ -3,17 +3,33 @@ package main
import (
"fmt"
"os"
+ "path"
)
+var mainUsage = []string{
+ "-C [-q] -p pubkey -x sigfile [file ...]",
+ "-G [-n] [-c comment] -p pubkey -s seckey",
+ "-S [-ez] [-x sigfile] -s seckey -m message",
+ "-V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message",
+}
+
+func progname() string {
+ return path.Base(os.Args[0])
+}
+
func usage() {
fmt.Print("Usage:")
- fmt.Println("\tsignify -C [-q] -p pubkey -x sigfile [file ...]")
- fmt.Println("\tsignify -G [-n] [-c comment] -p pubkey -s seckey")
- fmt.Println("\tsignify -S [-ez] [-x sigfile] -s seckey -m message")
- fmt.Println("\tsignify -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message")
+ for _, u := range mainUsage {
+ fmt.Printf("\t%v %v\n", progname(), u)
+ }
os.Exit(2)
}
+func fail(err error) {
+ fmt.Println(err)
+ os.Exit(1)
+}
+
var modes = map[string]func([]string) error{
"-C": check,
"-G": generate,
@@ -30,7 +46,6 @@ func main() {
usage()
}
if err := mode(os.Args[2:]); err != nil {
- fmt.Println(err)
- os.Exit(1)
+ fail(err)
}
}
diff --git a/sign.go b/sign.go
index 368108f..571ee5a 100644
--- a/sign.go
+++ b/sign.go
@@ -16,7 +16,7 @@ func sign(args []string) error {
opts := flag.NewFlagSet("sign", flag.ExitOnError)
var (
embedded = opts.Bool("e", false, "Embed the message")
- zip = opts.Bool("z", false, "Sign gzip archive")
+ zip = opts.Bool("z", false, "Sign gzip archive") // TODO
sigFile = opts.String("x", "", "Signature file")
encFile = opts.String("s", "", "Secret file (required)")
msgFile = opts.String("m", "", "Message file (required)")
diff --git a/verify.go b/verify.go
index 3ea4fea..b76a8fa 100644
--- a/verify.go
+++ b/verify.go
@@ -17,7 +17,7 @@ func verify(args []string) error {
var (
embedded = opts.Bool("e", false, "Embed message")
quiet = opts.Bool("q", false, "Quiet mode")
- zip = opts.Bool("z", false, "Verify gzip archive")
+ zip = opts.Bool("z", false, "Verify gzip archive") // TODO
pubFile = opts.String("p", "", "Public key file")
keyType = opts.String("t", "", "Key type") // TODO
sigFile = opts.String("x", "", "Signature file")