aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-19 16:21:26 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-19 16:21:26 +0200
commit619afaba8db996ba61d90c69ed2261b5ab910473 (patch)
tree5b9572e9990798471173b4089f2c2b5f596a722a
parent056c22dd5f2898c1be71f1501874a08e2ec8c922 (diff)
Pkg
-rw-r--r--ask.go2
-rw-r--r--cmd/signify/main.go (renamed from main.go)52
-rw-r--r--file.go2
-rw-r--r--file_test.go2
-rw-r--r--keys.go2
-rw-r--r--keys_test.go2
6 files changed, 32 insertions, 30 deletions
diff --git a/ask.go b/ask.go
index c439bb5..2215877 100644
--- a/ask.go
+++ b/ask.go
@@ -1,4 +1,4 @@
-package main
+package signify
import (
"errors"
diff --git a/main.go b/cmd/signify/main.go
index 2e0adc1..6937894 100644
--- a/main.go
+++ b/cmd/signify/main.go
@@ -6,6 +6,8 @@ import (
"io/ioutil"
"log"
"path"
+
+ "dim13.org/signify"
)
/*
@@ -38,7 +40,7 @@ func main() {
switch {
case *generate:
- rounds := DefaultRounds
+ rounds := signify.DefaultRounds
if *nopass {
rounds = 0
}
@@ -59,58 +61,58 @@ func main() {
}
func Generate(pubFile, secFile, comment string, rounds int) error {
- pubKey, encKey, err := NewKey()
+ pubKey, encKey, err := signify.NewKey()
if err != nil {
return err
}
if rounds > 0 {
- pass, err := AskPassword(true)
+ pass, err := signify.AskPassword(true)
if err != nil {
return err
}
encKey.Kdf(pass, rounds)
}
- encRaw, err := Marshal(encKey)
+ encRaw, err := signify.Marshal(encKey)
if err != nil {
return err
}
- sfile := File{
+ sfile := signify.File{
Comment: fmt.Sprintf("%s secret key", comment),
RawKey: encRaw,
}
- if err := sfile.WriteFile(secFile, SecMode); err != nil {
+ if err := sfile.WriteFile(secFile, signify.SecMode); err != nil {
return err
}
- pubRaw, err := Marshal(pubKey)
+ pubRaw, err := signify.Marshal(pubKey)
if err != nil {
return err
}
- pfile := File{
+ pfile := signify.File{
Comment: fmt.Sprintf("%s public key", comment),
RawKey: pubRaw,
}
- if err := pfile.WriteFile(pubFile, PubMode); err != nil {
+ if err := pfile.WriteFile(pubFile, signify.PubMode); err != nil {
return err
}
return nil
}
-func OpenSec(fname string) (*EncKey, error) {
- f, err := ParseFile(fname)
+func OpenSec(fname string) (*signify.EncKey, error) {
+ f, err := signify.ParseFile(fname)
if err != nil {
return nil, err
}
- encKey := new(EncKey)
- if err := Unmarshal(f.RawKey, encKey); err != nil {
+ encKey := new(signify.EncKey)
+ if err := signify.Unmarshal(f.RawKey, encKey); err != nil {
return nil, err
}
if encKey.KDFRounds > 0 {
- pass, err := AskPassword(false)
+ pass, err := signify.AskPassword(false)
if err != nil {
return nil, err
}
@@ -122,13 +124,13 @@ func OpenSec(fname string) (*EncKey, error) {
return encKey, nil
}
-func OpenPub(fname string) (*PubKey, error) {
- f, err := ParseFile(fname)
+func OpenPub(fname string) (*signify.PubKey, error) {
+ f, err := signify.ParseFile(fname)
if err != nil {
return nil, err
}
- pubKey := new(PubKey)
- if err := Unmarshal(f.RawKey, pubKey); err != nil {
+ pubKey := new(signify.PubKey)
+ if err := signify.Unmarshal(f.RawKey, pubKey); err != nil {
return nil, err
}
if err := pubKey.Check(); err != nil {
@@ -137,13 +139,13 @@ func OpenPub(fname string) (*PubKey, error) {
return pubKey, nil
}
-func OpenSig(fname string) (*Sig, []byte, error) {
- f, err := ParseFile(fname + ".sig")
+func OpenSig(fname string) (*signify.Sig, []byte, error) {
+ f, err := signify.ParseFile(fname + ".sig")
if err != nil {
return nil, nil, err
}
- sig := new(Sig)
- if err := Unmarshal(f.RawKey, sig); err != nil {
+ sig := new(signify.Sig)
+ if err := signify.Unmarshal(f.RawKey, sig); err != nil {
return nil, nil, err
}
if err := sig.Check(); err != nil {
@@ -169,18 +171,18 @@ func Sign(msgFile, secFile string, embed bool) error {
return err
}
sig := encKey.Sign(body)
- sigRaw, err := Marshal(sig)
+ sigRaw, err := signify.Marshal(sig)
if err != nil {
return err
}
- sigfile := File{
+ sigfile := signify.File{
Comment: fmt.Sprintf("verify with %s", path.Base(secFile)), // TODO replace .sec with .pub
RawKey: sigRaw,
}
if embed {
sigfile.Message = body
}
- if err := sigfile.WriteFile(msgFile+".sig", PubMode); err != nil {
+ if err := sigfile.WriteFile(msgFile+".sig", signify.PubMode); err != nil {
return err
}
return nil
diff --git a/file.go b/file.go
index b1dcb01..5583263 100644
--- a/file.go
+++ b/file.go
@@ -1,4 +1,4 @@
-package main
+package signify
import (
"bufio"
diff --git a/file_test.go b/file_test.go
index 3bb28e1..092c36c 100644
--- a/file_test.go
+++ b/file_test.go
@@ -1,4 +1,4 @@
-package main
+package signify
import (
"bytes"
diff --git a/keys.go b/keys.go
index 96e5c2a..08c3ff4 100644
--- a/keys.go
+++ b/keys.go
@@ -1,4 +1,4 @@
-package main
+package signify
import (
"bytes"
diff --git a/keys_test.go b/keys_test.go
index 92c222b..15de7c5 100644
--- a/keys_test.go
+++ b/keys_test.go
@@ -1,4 +1,4 @@
-package main
+package signify
import (
"bytes"