aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--key/key.go (renamed from signify/keys.go)2
-rw-r--r--key/key_test.go (renamed from signify/keys_test.go)2
-rw-r--r--key/testdata/dim13.pub (renamed from signify/testdata/dim13.pub)0
-rw-r--r--key/testdata/dim13.sec (renamed from signify/testdata/dim13.sec)0
-rw-r--r--key/testdata/isc.txt.gz (renamed from signify/testdata/isc.txt.gz)bin501 -> 501 bytes
-rw-r--r--key/testdata/isc.txt.gz.sig (renamed from signify/testdata/isc.txt.gz.sig)bin775 -> 775 bytes
-rw-r--r--key/testdata/kdf.pub (renamed from signify/testdata/kdf.pub)0
-rw-r--r--key/testdata/kdf.sec (renamed from signify/testdata/kdf.sec)0
-rw-r--r--key/testdata/kdf.txt (renamed from signify/testdata/kdf.txt)0
-rw-r--r--key/testdata/key.pub (renamed from signify/testdata/key.pub)0
-rw-r--r--key/testdata/key.sec (renamed from signify/testdata/key.sec)0
-rw-r--r--key/testdata/key.txt (renamed from signify/testdata/key.txt)0
-rw-r--r--key/testdata/key.txt.sig (renamed from signify/testdata/key.txt.sig)0
-rw-r--r--key/testdata/test (renamed from signify/testdata/test)0
-rw-r--r--key/testdata/test.sig (renamed from signify/testdata/test.sig)0
-rw-r--r--main.go28
16 files changed, 16 insertions, 16 deletions
diff --git a/signify/keys.go b/key/key.go
index 07521ea..57978e0 100644
--- a/signify/keys.go
+++ b/key/key.go
@@ -1,4 +1,4 @@
-package signify
+package key
import (
"bytes"
diff --git a/signify/keys_test.go b/key/key_test.go
index 70ebb2d..ef1c09c 100644
--- a/signify/keys_test.go
+++ b/key/key_test.go
@@ -1,4 +1,4 @@
-package signify
+package key
import (
"bytes"
diff --git a/signify/testdata/dim13.pub b/key/testdata/dim13.pub
index 0efc253..0efc253 100644
--- a/signify/testdata/dim13.pub
+++ b/key/testdata/dim13.pub
diff --git a/signify/testdata/dim13.sec b/key/testdata/dim13.sec
index 51e0d28..51e0d28 100644
--- a/signify/testdata/dim13.sec
+++ b/key/testdata/dim13.sec
diff --git a/signify/testdata/isc.txt.gz b/key/testdata/isc.txt.gz
index 9800c17..9800c17 100644
--- a/signify/testdata/isc.txt.gz
+++ b/key/testdata/isc.txt.gz
Binary files differ
diff --git a/signify/testdata/isc.txt.gz.sig b/key/testdata/isc.txt.gz.sig
index 0b2ab0e..0b2ab0e 100644
--- a/signify/testdata/isc.txt.gz.sig
+++ b/key/testdata/isc.txt.gz.sig
Binary files differ
diff --git a/signify/testdata/kdf.pub b/key/testdata/kdf.pub
index abc3893..abc3893 100644
--- a/signify/testdata/kdf.pub
+++ b/key/testdata/kdf.pub
diff --git a/signify/testdata/kdf.sec b/key/testdata/kdf.sec
index b69b5e8..b69b5e8 100644
--- a/signify/testdata/kdf.sec
+++ b/key/testdata/kdf.sec
diff --git a/signify/testdata/kdf.txt b/key/testdata/kdf.txt
index 9daeafb..9daeafb 100644
--- a/signify/testdata/kdf.txt
+++ b/key/testdata/kdf.txt
diff --git a/signify/testdata/key.pub b/key/testdata/key.pub
index 07f9107..07f9107 100644
--- a/signify/testdata/key.pub
+++ b/key/testdata/key.pub
diff --git a/signify/testdata/key.sec b/key/testdata/key.sec
index 32abaed..32abaed 100644
--- a/signify/testdata/key.sec
+++ b/key/testdata/key.sec
diff --git a/signify/testdata/key.txt b/key/testdata/key.txt
index 1a4db74..1a4db74 100644
--- a/signify/testdata/key.txt
+++ b/key/testdata/key.txt
diff --git a/signify/testdata/key.txt.sig b/key/testdata/key.txt.sig
index c8326bd..c8326bd 100644
--- a/signify/testdata/key.txt.sig
+++ b/key/testdata/key.txt.sig
diff --git a/signify/testdata/test b/key/testdata/test
index 557db03..557db03 100644
--- a/signify/testdata/test
+++ b/key/testdata/test
diff --git a/signify/testdata/test.sig b/key/testdata/test.sig
index 1a1bdf0..1a1bdf0 100644
--- a/signify/testdata/test.sig
+++ b/key/testdata/test.sig
diff --git a/main.go b/main.go
index ee2f52c..4d131e1 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,7 @@ import (
"dim13.org/signify/ask"
"dim13.org/signify/file"
- "dim13.org/signify/signify"
+ "dim13.org/signify/key"
)
/*
@@ -62,7 +62,7 @@ func Generate(pubFile, encFile, comment string, nopass bool) error {
return err
}
- pubKey, encKey, err := signify.NewKey()
+ pubKey, encKey, err := key.NewKey()
if err != nil {
return err
}
@@ -72,7 +72,7 @@ func Generate(pubFile, encFile, comment string, nopass bool) error {
}
encKey.Kdf(ask.Confirmed)
- encRaw, err := signify.Marshal(encKey)
+ encRaw, err := key.Marshal(encKey)
if err != nil {
return err
}
@@ -85,7 +85,7 @@ func Generate(pubFile, encFile, comment string, nopass bool) error {
return err
}
- pubRaw, err := signify.Marshal(pubKey)
+ pubRaw, err := key.Marshal(pubKey)
if err != nil {
return err
}
@@ -100,13 +100,13 @@ func Generate(pubFile, encFile, comment string, nopass bool) error {
return nil
}
-func OpenEnc(fname string) (*signify.Enc, error) {
+func OpenEnc(fname string) (*key.Enc, error) {
block, err := file.DecodeFile(fname)
if err != nil {
return nil, err
}
- encKey := new(signify.Enc)
- if err := signify.Unmarshal(block.Bytes, encKey); err != nil {
+ encKey := new(key.Enc)
+ if err := key.Unmarshal(block.Bytes, encKey); err != nil {
return nil, err
}
encKey.Kdf(ask.Password)
@@ -116,13 +116,13 @@ func OpenEnc(fname string) (*signify.Enc, error) {
return encKey, nil
}
-func OpenPub(fname string) (*signify.Pub, error) {
+func OpenPub(fname string) (*key.Pub, error) {
block, err := file.DecodeFile(fname)
if err != nil {
return nil, err
}
- pubKey := new(signify.Pub)
- if err := signify.Unmarshal(block.Bytes, pubKey); err != nil {
+ pubKey := new(key.Pub)
+ if err := key.Unmarshal(block.Bytes, pubKey); err != nil {
return nil, err
}
if err := pubKey.Check(); err != nil {
@@ -131,13 +131,13 @@ func OpenPub(fname string) (*signify.Pub, error) {
return pubKey, nil
}
-func OpenSig(fname string) (*signify.Sig, []byte, error) {
+func OpenSig(fname string) (*key.Sig, []byte, error) {
block, err := file.DecodeFile(fname + ".sig")
if err != nil {
return nil, nil, err
}
- sig := new(signify.Sig)
- if err := signify.Unmarshal(block.Bytes, sig); err != nil {
+ sig := new(key.Sig)
+ if err := key.Unmarshal(block.Bytes, sig); err != nil {
return nil, nil, err
}
if err := sig.Check(); err != nil {
@@ -163,7 +163,7 @@ func Sign(msgFile, encFile string, embed bool) error {
return err
}
sig := encKey.Sign(body)
- sigRaw, err := signify.Marshal(sig)
+ sigRaw, err := key.Marshal(sig)
if err != nil {
return err
}