From 51693e607e26f82b73467a0edcacab3fea70a16b Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 19 Apr 2017 13:25:46 +0200 Subject: ws --- main.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 34615fd..6af2b15 100644 --- a/main.go +++ b/main.go @@ -154,14 +154,14 @@ func OpenSig(fname string) (*Sig, []byte, error) { if !sig.IsValid() { return nil, nil, ErrInvalidKey } - if len(f.Message) == 0 { - body, err := ioutil.ReadFile(fname) - if err != nil { - return nil, nil, err - } - f.Message = body + if len(f.Message) > 0 { + return sig, f.Message, nil + } + body, err := ioutil.ReadFile(fname) + if err != nil { + return nil, nil, err } - return sig, f.Message, nil + return sig, body, nil } func Sign(msgFile, secFile string, embed bool) error { @@ -169,7 +169,6 @@ func Sign(msgFile, secFile string, embed bool) error { if err != nil { return err } - body, err := ioutil.ReadFile(msgFile) if err != nil { return err @@ -197,16 +196,13 @@ func Verify(msgFile, pubFile string) error { if err != nil { return err } - sig, body, err := OpenSig(msgFile) if err != nil { return err } - if !pubKey.Verify(body, sig) { return ErrInvalidSig } - log.Println(verOK) return nil } -- cgit v1.2.3