aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-08-04 23:23:51 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-08-04 23:23:51 +0200
commit8084465e13ee600c733b709059dfbaa753603674 (patch)
tree40c070baf9befbc42208d301933859493bb6cbaf
parentb1d650c6542a8573ecfb204a037df12731272822 (diff)
Rename file to b64file
-rw-r--r--b64file/file.go (renamed from file/file.go)2
-rw-r--r--b64file/file_test.go (renamed from file/file_test.go)2
-rw-r--r--b64file/names.go (renamed from file/names.go)2
-rw-r--r--b64file/names_test.go (renamed from file/names_test.go)2
-rw-r--r--generate.go8
-rw-r--r--sign.go14
-rw-r--r--verify.go12
7 files changed, 21 insertions, 21 deletions
diff --git a/file/file.go b/b64file/file.go
index 507cdd0..ebca8fe 100644
--- a/file/file.go
+++ b/b64file/file.go
@@ -1,5 +1,5 @@
// Package file implements signify file format
-package file
+package b64file
import (
"bufio"
diff --git a/file/file_test.go b/b64file/file_test.go
index 5a2aa8d..ac95c38 100644
--- a/file/file_test.go
+++ b/b64file/file_test.go
@@ -1,4 +1,4 @@
-package file
+package b64file
import (
"bytes"
diff --git a/file/names.go b/b64file/names.go
index f893294..83d73d2 100644
--- a/file/names.go
+++ b/b64file/names.go
@@ -1,4 +1,4 @@
-package file
+package b64file
import (
"errors"
diff --git a/file/names_test.go b/b64file/names_test.go
index a24faee..0acabed 100644
--- a/file/names_test.go
+++ b/b64file/names_test.go
@@ -1,4 +1,4 @@
-package file
+package b64file
import "testing"
diff --git a/generate.go b/generate.go
index d912ada..607b566 100644
--- a/generate.go
+++ b/generate.go
@@ -4,7 +4,7 @@ import (
"flag"
"dim13.org/signify/ask"
- "dim13.org/signify/file"
+ "dim13.org/signify/b64file"
"dim13.org/signify/key"
)
@@ -23,7 +23,7 @@ func generate(args []string) error {
opts.Usage()
return nil
}
- if err := file.ValidateNames(*pubFile, *secFile); err != nil {
+ if err := b64file.ValidateNames(*pubFile, *secFile); err != nil {
return err
}
@@ -37,10 +37,10 @@ func generate(args []string) error {
return err
}
- if err := file.EncodeFile(*secFile, file.ModeSec, secKey, *comment+" secret key", nil); err != nil {
+ if err := b64file.EncodeFile(*secFile, b64file.ModeSec, secKey, *comment+" secret key", nil); err != nil {
return err
}
- if err := file.EncodeFile(*pubFile, file.ModePub, pubKey, *comment+" public key", nil); err != nil {
+ if err := b64file.EncodeFile(*pubFile, b64file.ModePub, pubKey, *comment+" public key", nil); err != nil {
return err
}
return nil
diff --git a/sign.go b/sign.go
index ba49418..1a9fec7 100644
--- a/sign.go
+++ b/sign.go
@@ -7,7 +7,7 @@ import (
"os"
"dim13.org/signify/ask"
- "dim13.org/signify/file"
+ "dim13.org/signify/b64file"
"dim13.org/signify/key"
"dim13.org/signify/zsig"
)
@@ -29,7 +29,7 @@ func sign(args []string) error {
return nil
}
if *sigFile == "" {
- *sigFile = file.SigName(*msgFile)
+ *sigFile = b64file.SigName(*msgFile)
}
switch {
@@ -62,8 +62,8 @@ func signPlain(secFile, msgFile, sigFile string) error {
return err
}
sig := sec.Sign(msg)
- comment := file.VerifyWith(secFile)
- return file.EncodeFile(sigFile, file.ModeSig, sig, comment, nil)
+ comment := b64file.VerifyWith(secFile)
+ return b64file.EncodeFile(sigFile, b64file.ModeSig, sig, comment, nil)
}
func signEmbedded(secFile, msgFile, sigFile string) error {
@@ -76,8 +76,8 @@ func signEmbedded(secFile, msgFile, sigFile string) error {
return err
}
sig := sec.Sign(msg)
- comment := file.VerifyWith(secFile)
- return file.EncodeFile(sigFile, file.ModeSig, sig, comment, msg)
+ comment := b64file.VerifyWith(secFile)
+ return b64file.EncodeFile(sigFile, b64file.ModeSig, sig, comment, msg)
}
// TODO
@@ -107,7 +107,7 @@ func signGzip(secFile, msgFile, sigFile string) error {
func openSec(fname string) (*key.Sec, error) {
sec := new(key.Sec)
- if _, _, err := file.DecodeFile(fname, sec); err != nil {
+ if _, _, err := b64file.DecodeFile(fname, sec); err != nil {
return nil, err
}
if err := sec.Crypt(ask.Passphrase{}); err != nil {
diff --git a/verify.go b/verify.go
index bf73af5..25615a1 100644
--- a/verify.go
+++ b/verify.go
@@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"
- "dim13.org/signify/file"
+ "dim13.org/signify/b64file"
"dim13.org/signify/key"
"dim13.org/signify/zsig"
)
@@ -30,7 +30,7 @@ func verify(args []string) error {
return nil
}
if *sigFile == "" {
- *sigFile = file.SigName(*msgFile)
+ *sigFile = b64file.SigName(*msgFile)
}
_ = keyType // TODO
@@ -103,7 +103,7 @@ func verifyGzip(pubFile, sigFile string) error {
}
sig := new(key.Sig)
- _, msg, err := file.DecodeString(z.Comment, sig)
+ _, msg, err := b64file.DecodeString(z.Comment, sig)
if err != nil {
return err
}
@@ -129,7 +129,7 @@ func verifyGzip(pubFile, sigFile string) error {
func openPub(fname string) (*key.Pub, error) {
pub := new(key.Pub)
- if _, _, err := file.DecodeFile(fname, pub); err != nil {
+ if _, _, err := b64file.DecodeFile(fname, pub); err != nil {
return nil, err
}
if err := pub.Validate(); err != nil {
@@ -140,13 +140,13 @@ func openPub(fname string) (*key.Pub, error) {
func openSig(fname string) (*key.Sig, []byte, string, error) {
sig := new(key.Sig)
- comment, msg, err := file.DecodeFile(fname, sig)
+ comment, msg, err := b64file.DecodeFile(fname, sig)
if err != nil {
return nil, nil, "", err
}
if err := sig.Validate(); err != nil {
return nil, nil, "", err
}
- pubKey := file.PubFile(comment)
+ pubKey := b64file.PubFile(comment)
return sig, msg, pubKey, nil
}