From 1a9115a96872af03f5fb97b0e6e6f84003b39fa4 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 8 Jul 2017 14:08:31 +0200 Subject: Go vet --- ask/ask_test.go | 2 +- generate.go | 7 +++++-- kdf.go | 3 ++- main.go | 7 ++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ask/ask_test.go b/ask/ask_test.go index 71bc663..ae1e52c 100644 --- a/ask/ask_test.go +++ b/ask/ask_test.go @@ -21,7 +21,7 @@ func TestAsk(t *testing.T) { t.Fatalf("got %v, want %v", err, tc.err) } if pass != tc.pass { - t.Error("got %v, want %v", pass, tc.pass) + t.Errorf("got %v, want %v", pass, tc.pass) } }) } diff --git a/generate.go b/generate.go index 52a95f6..e1406bd 100644 --- a/generate.go +++ b/generate.go @@ -31,12 +31,15 @@ func generate(args []string) error { if err != nil { return err } + + askFn := ask.Confirmed if *nopass { - encKey.KDFRounds = 0 + askFn = nil } - if err := Kdf(encKey, ask.Confirmed); err != nil { + if err := Kdf(encKey, askFn); err != nil { return err } + if err := writeFile(*encFile, *comment+" secret key", encKey, file.EncMode); err != nil { return err } diff --git a/kdf.go b/kdf.go index 8926216..ad40a1b 100644 --- a/kdf.go +++ b/kdf.go @@ -6,7 +6,8 @@ import ( ) func Kdf(enc *key.Enc, ask func() (string, error)) error { - if enc.KDFRounds == 0 { + if enc.KDFRounds == 0 || ask == nil { + enc.KDFRounds = 0 return nil } pass, err := ask() diff --git a/main.go b/main.go index 8000e08..c140eb2 100644 --- a/main.go +++ b/main.go @@ -13,14 +13,11 @@ var mainUsage = []string{ "-V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message", } -func progname() string { - return path.Base(os.Args[0]) -} - func usage() { + progname := path.Base(os.Args[0]) fmt.Print("Usage:") for _, u := range mainUsage { - fmt.Printf("\t%v %v\n", progname(), u) + fmt.Printf("\t%v %v\n", progname, u) } os.Exit(2) } -- cgit v1.2.3