aboutsummaryrefslogtreecommitdiff
path: root/keys.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-16 23:22:50 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-16 23:22:50 +0200
commit6c1978e53160fea0700cd2f3044d48ea2eddbbb5 (patch)
treed71acf8db7f05b6462f20a7c67ee555c649df3ef /keys.go
parent2fecd5783f11680b8f95b9e1a0b9db1bc2e305d1 (diff)
Move base64 out of key representation to file container
Diffstat (limited to 'keys.go')
-rw-r--r--keys.go10
1 files changed, 2 insertions, 8 deletions
diff --git a/keys.go b/keys.go
index 53dd536..b48302e 100644
--- a/keys.go
+++ b/keys.go
@@ -3,7 +3,6 @@ package main
import (
"bytes"
"crypto/sha512"
- "encoding/base64"
"encoding/binary"
"dim13.org/signify/bhash"
@@ -58,8 +57,7 @@ func (v *EncKey) IsValid(pass []byte) bool {
func Unmarshal(b []byte, v interface{}) error {
buf := bytes.NewReader(b)
- dec := base64.NewDecoder(base64.StdEncoding, buf)
- if err := binary.Read(dec, binary.BigEndian, v); err != nil {
+ if err := binary.Read(buf, binary.BigEndian, v); err != nil {
return err
}
return nil
@@ -67,11 +65,7 @@ func Unmarshal(b []byte, v interface{}) error {
func Marshal(v interface{}) ([]byte, error) {
buf := new(bytes.Buffer)
- enc := base64.NewEncoder(base64.StdEncoding, buf)
- if err := binary.Write(enc, binary.BigEndian, v); err != nil {
- return nil, err
- }
- if err := enc.Close(); err != nil {
+ if err := binary.Write(buf, binary.BigEndian, v); err != nil {
return nil, err
}
return buf.Bytes(), nil