From e718cddb32df846caea3a1235a3dc806e03dc1e4 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 24 Jul 2017 14:03:41 +0200 Subject: ErrEZ --- main.go | 3 +++ sign.go | 6 ++---- verify.go | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 4f17f71..e1f3850 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "errors" "fmt" "os" ) @@ -12,6 +13,8 @@ var mainUsage = []string{ "-V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message", } +var ErrEZ = errors.New("can't combine -e and -z options") + func usage() { fmt.Println("Usage:") for _, u := range mainUsage { diff --git a/sign.go b/sign.go index aaea030..37a506f 100644 --- a/sign.go +++ b/sign.go @@ -1,7 +1,6 @@ package main import ( - "errors" "flag" "io/ioutil" @@ -22,9 +21,6 @@ func sign(args []string) error { msgFile = opts.String("m", "", "Message file (required)") ) opts.Parse(args) - if *embedded && *zip { - return errors.New("can't combine -e and -z options") - } if *secFile == "" || *msgFile == "" { opts.Usage() return nil @@ -34,6 +30,8 @@ func sign(args []string) error { } switch { + case *zip && *embedded: + return ErrEZ case *zip: if err := signGzip(*secFile, *msgFile, *sigFile); err != nil { return err diff --git a/verify.go b/verify.go index bf6f8f2..9f71dc8 100644 --- a/verify.go +++ b/verify.go @@ -1,7 +1,6 @@ package main import ( - "errors" "flag" "fmt" "io/ioutil" @@ -24,9 +23,6 @@ func verify(args []string) error { msgFile = opts.String("m", "", "Message file (required)") ) opts.Parse(args) - if *embedded && *zip { - return errors.New("can't combine -e and -z options") - } if *msgFile == "" { opts.Usage() return nil @@ -37,6 +33,8 @@ func verify(args []string) error { _ = keyType // TODO switch { + case *zip && *embedded: + return ErrEZ case *zip: if err := verifyGzip(*pubFile, *msgFile); err != nil { return err -- cgit v1.2.3