aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--file.go5
-rw-r--r--main.go6
2 files changed, 7 insertions, 4 deletions
diff --git a/file.go b/file.go
index 6bff903..b1dcb01 100644
--- a/file.go
+++ b/file.go
@@ -20,7 +20,6 @@ type File struct {
const (
commentHdr = "untrusted comment:"
- verifyWith = "verify with"
sigFrom = "signature from %s"
)
@@ -40,6 +39,10 @@ func checkComment(comment string) error {
return nil
}
+func (f *File) Embedded() bool {
+ return len(f.Message) > 0
+}
+
func (f *File) ReadFrom(r io.Reader) error {
buf := bufio.NewReader(r)
diff --git a/main.go b/main.go
index 6af2b15..2321472 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 {
+ if f.Embedded() {
return sig, f.Message, nil
}
- body, err := ioutil.ReadFile(fname)
+ msg, err := ioutil.ReadFile(fname)
if err != nil {
return nil, nil, err
}
- return sig, body, nil
+ return sig, msg, nil
}
func Sign(msgFile, secFile string, embed bool) error {