aboutsummaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-19 13:25:46 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-19 13:25:46 +0200
commit51693e607e26f82b73467a0edcacab3fea70a16b (patch)
tree138cd171d6d8fbb7e1f6c3031db844662aa98f66 /main.go
parentc4af3f77aa0a93669eeaac4b14d4e0fcdc02a2d0 (diff)
ws
Diffstat (limited to 'main.go')
-rw-r--r--main.go18
1 files changed, 7 insertions, 11 deletions
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
}