From 17ff78ec85558342223cc9d03099bd87cbf28537 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 23 Oct 2016 16:38:33 +0200 Subject: Read/Write whole struct --- sig.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'sig.go') diff --git a/sig.go b/sig.go index 5abea82..3ff334d 100644 --- a/sig.go +++ b/sig.go @@ -3,7 +3,7 @@ package main import ( "bytes" "encoding/base64" - "io" + "encoding/binary" "golang.org/x/crypto/ed25519" ) @@ -17,18 +17,14 @@ type Sig struct { func (v *Sig) Unmarshal(b []byte) error { buf := bytes.NewBuffer(b) dec := base64.NewDecoder(base64.StdEncoding, buf) - io.ReadFull(dec, v.PKAlg[:]) - io.ReadFull(dec, v.KeyNum[:]) - io.ReadFull(dec, v.Sig[:]) - return nil + err := binary.Read(dec, binary.BigEndian, v) + return err } func (v *Sig) Marshal() ([]byte, error) { buf := new(bytes.Buffer) enc := base64.NewEncoder(base64.StdEncoding, buf) - enc.Write(v.PKAlg[:]) - enc.Write(v.KeyNum[:]) - enc.Write(v.Sig[:]) + err := binary.Write(enc, binary.BigEndian, v) enc.Close() - return buf.Bytes(), nil + return buf.Bytes(), err } -- cgit v1.2.3