aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-23 01:34:40 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-23 01:34:40 +0200
commit088135569acd6617c929b64e644e377e316f7df1 (patch)
tree193c0baa232bcc0c2b923eefd4ad94bedbe4f359
parent14c91fc45000155f6cfae789b3e9cd758c1e82d4 (diff)
unexport block
-rw-r--r--file/file.go18
-rw-r--r--file/file_test.go2
-rw-r--r--generate.go18
-rw-r--r--sign.go22
4 files changed, 18 insertions, 42 deletions
diff --git a/file/file.go b/file/file.go
index 4fde2f3..fa77cd0 100644
--- a/file/file.go
+++ b/file/file.go
@@ -22,19 +22,19 @@ const (
var ErrComment = errors.New("expected untrusted comment")
-// Block represents a encoded signify key or signature
+// block represents a encoded signify key or signature
//
// The encoded form is:
// untrusted comment: comment
// base64-encoded key
// optional message
-type Block struct {
+type block struct {
Comment string
Bytes []byte
Message []byte // TODO replace with io.ReadCloser
}
-func decodeBlock(r io.Reader) (*Block, error) {
+func decodeBlock(r io.Reader) (*block, error) {
buf := bufio.NewReader(r)
comment, err := buf.ReadString('\n')
if err != nil {
@@ -55,7 +55,7 @@ func decodeBlock(r io.Reader) (*Block, error) {
if err != nil {
return nil, err
}
- return &Block{
+ return &block{
Comment: strings.TrimSpace(comment[len(untrusted):]),
Bytes: b,
Message: message,
@@ -82,28 +82,28 @@ func Decode(r io.Reader, u encoding.BinaryUnmarshaler) (string, []byte, error) {
return block.Comment, block.Message, nil
}
-func encodeBlock(w io.Writer, b *Block) error {
+func encodeBlock(w io.Writer, b *block) error {
fmt.Fprintln(w, untrusted, b.Comment)
fmt.Fprintln(w, base64.StdEncoding.EncodeToString(b.Bytes))
w.Write(b.Message)
return nil
}
-func EncodeFile(fname string, perm os.FileMode, b *Block) error {
+func EncodeFile(fname string, perm os.FileMode, u encoding.BinaryMarshaler, comment string, msg []byte) error {
fd, err := os.OpenFile(fname, os.O_WRONLY|os.O_CREATE|os.O_EXCL, perm)
if err != nil {
return err
}
defer fd.Close()
- return encodeBlock(fd, b)
+ return Encode(fd, u, comment, msg)
}
-func Encode(w io.Writer, comment string, u encoding.BinaryMarshaler, msg []byte) error {
+func Encode(w io.Writer, u encoding.BinaryMarshaler, comment string, msg []byte) error {
raw, err := u.MarshalBinary()
if err != nil {
return err
}
- b := &Block{
+ b := &block{
Comment: comment,
Bytes: raw,
Message: msg,
diff --git a/file/file_test.go b/file/file_test.go
index 783b92c..b35c147 100644
--- a/file/file_test.go
+++ b/file/file_test.go
@@ -6,7 +6,7 @@ import (
)
func TestSig(t *testing.T) {
- b := &Block{
+ b := &block{
Comment: "comment",
Bytes: []byte{'t', 'e', 's', 't'},
}
diff --git a/generate.go b/generate.go
index aa57018..d912ada 100644
--- a/generate.go
+++ b/generate.go
@@ -1,9 +1,7 @@
package main
import (
- "encoding"
"flag"
- "os"
"dim13.org/signify/ask"
"dim13.org/signify/file"
@@ -39,23 +37,11 @@ func generate(args []string) error {
return err
}
- if err := writeFile(*secFile, *comment+" secret key", secKey, file.ModeSec); err != nil {
+ if err := file.EncodeFile(*secFile, file.ModeSec, secKey, *comment+" secret key", nil); err != nil {
return err
}
- if err := writeFile(*pubFile, *comment+" public key", pubKey, file.ModePub); err != nil {
+ if err := file.EncodeFile(*pubFile, file.ModePub, pubKey, *comment+" public key", nil); err != nil {
return err
}
return nil
}
-
-func writeFile(fname, comment string, v encoding.BinaryMarshaler, mode os.FileMode) error {
- raw, err := v.MarshalBinary()
- if err != nil {
- return err
- }
- block := &file.Block{
- Comment: comment,
- Bytes: raw,
- }
- return file.EncodeFile(fname, mode, block)
-}
diff --git a/sign.go b/sign.go
index ed2091d..8c99f4e 100644
--- a/sign.go
+++ b/sign.go
@@ -38,26 +38,16 @@ func sign(args []string) error {
if err != nil {
return err
}
- body, err := ioutil.ReadFile(*msgFile)
+ msg, err := ioutil.ReadFile(*msgFile)
if err != nil {
return err
}
- sig := secKey.Sign(body)
- raw, err := sig.MarshalBinary()
- if err != nil {
- return err
- }
- block := &file.Block{
- Comment: file.VerifyWith(*secFile),
- Bytes: raw,
- }
- if *embedded {
- block.Message = body // TODO implement as acting on io.Writer
- }
- if err := file.EncodeFile(*sigFile, file.ModeSig, block); err != nil {
- return err
+ sig := secKey.Sign(msg)
+ comment := file.VerifyWith(*secFile)
+ if !*embedded {
+ msg = nil
}
- return nil
+ return file.EncodeFile(*sigFile, file.ModeSig, sig, comment, msg)
}
func openSec(fname string) (*key.Sec, error) {