aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-14 18:25:37 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-14 18:25:37 +0200
commit550f28d6937c01c998f582aebf27a6a8d6c2906d (patch)
tree824498e70203842ff0090f24407363cb090ffaa2
parent23cdde3d53d400643521f863e313d5b3efca0108 (diff)
Swap args
-rw-r--r--keys.go2
-rw-r--r--keys_test.go8
2 files changed, 5 insertions, 5 deletions
diff --git a/keys.go b/keys.go
index 896f1e8..d64399c 100644
--- a/keys.go
+++ b/keys.go
@@ -58,7 +58,7 @@ func (v *EncKey) IsValid(pass []byte) bool {
return bytes.Equal(sum[:len(v.Checksum)], v.Checksum[:])
}
-func Unmarshal(v interface{}, b []byte) error {
+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 {
diff --git a/keys_test.go b/keys_test.go
index 283c674..f4c5f31 100644
--- a/keys_test.go
+++ b/keys_test.go
@@ -8,7 +8,7 @@ import (
func TestUnmarshalSig(t *testing.T) {
b64sig := []byte(`RWRbOC0bBf7abaGwGtq45KLDK63tgcF7CO4qTZSlTKCSbZTYlDfFm/DISQ60u+/jEzrk22suvXXAEsxQTe2xUOfV90get1YRGQo=`)
v := new(Sig)
- Unmarshal(v, b64sig)
+ Unmarshal(b64sig, v)
out, _ := Marshal(v)
if !bytes.Equal(b64sig, out) {
t.Errorf("want %v, got %v", b64sig, out)
@@ -19,7 +19,7 @@ func TestUnmarshalSig(t *testing.T) {
func TestUnmarshalPub(t *testing.T) {
b64pub := []byte(`RWRbOC0bBf7abfanaXuTYfCa6+YO69Kxyz8RD5nL/3Ta7umY6iOwnBrG`)
v := new(PubKey)
- Unmarshal(v, b64pub)
+ Unmarshal(b64pub, v)
out, _ := Marshal(v)
if !bytes.Equal(b64pub, out) {
t.Errorf("want %v, got %v", b64pub, out)
@@ -30,7 +30,7 @@ func TestUnmarshalPub(t *testing.T) {
func TestUnmarshalEnc(t *testing.T) {
b64enc := []byte(`RWRCSwAAAACzJBN2gC5//jVvDiV76rs4m2aKXkljqDpbOC0bBf7abZhV/Zygr6b0KIbSI56JQutwzsQeouxnnHuVTZp3IW4M9qdpe5Nh8Jrr5g7r0rHLPxEPmcv/dNru6ZjqI7CcGsY=`)
v := new(EncKey)
- Unmarshal(v, b64enc)
+ Unmarshal(b64enc, v)
out, _ := Marshal(v)
if !bytes.Equal(b64enc, out) {
t.Errorf("want %v, got %v", b64enc, out)
@@ -44,7 +44,7 @@ func TestUnmarshalEnc(t *testing.T) {
func TestUnmarshalKDF(t *testing.T) {
b64enc := []byte(`RWRCSwAAACoXv4r2lp3RYYLEWZRsY+1Z+1mJtEScNBaKdOKcMdhUHrztnf8a4sUNGY19MoV3wX2cyW2Mn1MduKxi9s3Se070TGF0IZG/hH4SKiNUYi+yi1mandWAwmhY3ahIHApigTk=`)
v := new(EncKey)
- Unmarshal(v, b64enc)
+ Unmarshal(b64enc, v)
out, _ := Marshal(v)
if !bytes.Equal(b64enc, out) {
t.Errorf("want %v, got %v", b64enc, out)