aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd_sign.go21
-rw-r--r--cmd_verify.go34
-rw-r--r--file.go17
-rw-r--r--files.go76
4 files changed, 76 insertions, 72 deletions
diff --git a/cmd_sign.go b/cmd_sign.go
index e1d687c..74398c3 100644
--- a/cmd_sign.go
+++ b/cmd_sign.go
@@ -6,9 +6,7 @@ import (
"io/ioutil"
"log"
- "dim13.org/signify/ask"
"dim13.org/signify/b64file"
- "dim13.org/signify/key"
"dim13.org/signify/zsig"
"github.com/google/subcommands"
)
@@ -128,22 +126,3 @@ func (m *signCmd) zipped() error {
log.Println(body)
return nil
}
-
-func openSec(fname string) (*key.Sec, error) {
- sec := new(key.Sec)
- fd, err := Open(fname)
- if err != nil {
- return nil, err
- }
- defer fd.Close()
- if _, _, err := b64file.Decode(fd, sec); err != nil {
- return nil, err
- }
- if err := sec.Crypt(ask.Passphrase{}); err != nil {
- return nil, err
- }
- if err := sec.Validate(); err != nil {
- return nil, err
- }
- return sec, nil
-}
diff --git a/cmd_verify.go b/cmd_verify.go
index 148c75f..16f2e63 100644
--- a/cmd_verify.go
+++ b/cmd_verify.go
@@ -144,37 +144,3 @@ func (m *verifyCmd) zipped() error {
return zhead.Verify(z)
}
-
-func openPub(fname string) (*key.Pub, error) {
- pub := new(key.Pub)
- fd, err := Open(fname)
- if err != nil {
- return nil, err
- }
- defer fd.Close()
- if _, _, err := b64file.Decode(fd, pub); err != nil {
- return nil, err
- }
- if err := pub.Validate(); err != nil {
- return nil, err
- }
- return pub, nil
-}
-
-func openSig(fname string) (*key.Sig, []byte, string, error) {
- sig := new(key.Sig)
- fd, err := Open(fname)
- if err != nil {
- return nil, nil, "", err
- }
- defer fd.Close()
- comment, msg, err := b64file.Decode(fd, sig)
- if err != nil {
- return nil, nil, "", err
- }
- if err := sig.Validate(); err != nil {
- return nil, nil, "", err
- }
- pubKey := CommentPubFile(comment)
- return sig, msg, pubKey, nil
-}
diff --git a/file.go b/file.go
deleted file mode 100644
index 97f5eed..0000000
--- a/file.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package main
-
-import "os"
-
-const (
- ModeSec os.FileMode = 0600
- ModePub os.FileMode = 0644
- ModeSig os.FileMode = 0644
-)
-
-func Open(fname string) (*os.File, error) {
- return os.OpenFile(fname, os.O_RDONLY, 0)
-}
-
-func Create(fname string, perm os.FileMode) (*os.File, error) {
- return os.OpenFile(fname, os.O_WRONLY|os.O_CREATE|os.O_EXCL, perm)
-}
diff --git a/files.go b/files.go
new file mode 100644
index 0000000..f1a432d
--- /dev/null
+++ b/files.go
@@ -0,0 +1,76 @@
+package main
+
+import (
+ "os"
+
+ "dim13.org/signify/ask"
+ "dim13.org/signify/b64file"
+ "dim13.org/signify/key"
+)
+
+const (
+ ModeSec os.FileMode = 0600
+ ModePub os.FileMode = 0644
+ ModeSig os.FileMode = 0644
+)
+
+func Open(fname string) (*os.File, error) {
+ return os.OpenFile(fname, os.O_RDONLY, 0)
+}
+
+func Create(fname string, perm os.FileMode) (*os.File, error) {
+ return os.OpenFile(fname, os.O_WRONLY|os.O_CREATE|os.O_EXCL, perm)
+}
+
+func openSec(fname string) (*key.Sec, error) {
+ sec := new(key.Sec)
+ fd, err := Open(fname)
+ if err != nil {
+ return nil, err
+ }
+ defer fd.Close()
+ if _, _, err := b64file.Decode(fd, sec); err != nil {
+ return nil, err
+ }
+ if err := sec.Crypt(ask.Passphrase{}); err != nil {
+ return nil, err
+ }
+ if err := sec.Validate(); err != nil {
+ return nil, err
+ }
+ return sec, nil
+}
+
+func openPub(fname string) (*key.Pub, error) {
+ pub := new(key.Pub)
+ fd, err := Open(fname)
+ if err != nil {
+ return nil, err
+ }
+ defer fd.Close()
+ if _, _, err := b64file.Decode(fd, pub); err != nil {
+ return nil, err
+ }
+ if err := pub.Validate(); err != nil {
+ return nil, err
+ }
+ return pub, nil
+}
+
+func openSig(fname string) (*key.Sig, []byte, string, error) {
+ sig := new(key.Sig)
+ fd, err := Open(fname)
+ if err != nil {
+ return nil, nil, "", err
+ }
+ defer fd.Close()
+ comment, msg, err := b64file.Decode(fd, sig)
+ if err != nil {
+ return nil, nil, "", err
+ }
+ if err := sig.Validate(); err != nil {
+ return nil, nil, "", err
+ }
+ pubKey := CommentPubFile(comment)
+ return sig, msg, pubKey, nil
+}