From 6c1978e53160fea0700cd2f3044d48ea2eddbbb5 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 16 Apr 2017 23:22:50 +0200 Subject: Move base64 out of key representation to file container --- keys_test.go | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) (limited to 'keys_test.go') diff --git a/keys_test.go b/keys_test.go index 2b44110..71f27f3 100644 --- a/keys_test.go +++ b/keys_test.go @@ -2,36 +2,50 @@ package main import ( "bytes" + "encoding/base64" "testing" ) +func decode(s string) ([]byte, error) { + return base64.StdEncoding.DecodeString(s) +} + func TestUnmarshalSig(t *testing.T) { - b64sig := []byte(`RWRbOC0bBf7abaGwGtq45KLDK63tgcF7CO4qTZSlTKCSbZTYlDfFm/DISQ60u+/jEzrk22suvXXAEsxQTe2xUOfV90get1YRGQo=`) + raw, err := decode(`RWRbOC0bBf7abaGwGtq45KLDK63tgcF7CO4qTZSlTKCSbZTYlDfFm/DISQ60u+/jEzrk22suvXXAEsxQTe2xUOfV90get1YRGQo=`) + if err != nil { + t.Fatal(err) + } v := new(Sig) - Unmarshal(b64sig, v) + Unmarshal(raw, v) out, _ := Marshal(v) - if !bytes.Equal(b64sig, out) { - t.Errorf("want %v, got %v", b64sig, out) + if !bytes.Equal(raw, out) { + t.Errorf("want %v, got %v", raw, out) } } func TestUnmarshalPub(t *testing.T) { - b64pub := []byte(`RWRbOC0bBf7abfanaXuTYfCa6+YO69Kxyz8RD5nL/3Ta7umY6iOwnBrG`) + raw, err := decode(`RWRbOC0bBf7abfanaXuTYfCa6+YO69Kxyz8RD5nL/3Ta7umY6iOwnBrG`) + if err != nil { + t.Fatal(err) + } v := new(PubKey) - Unmarshal(b64pub, v) + Unmarshal(raw, v) out, _ := Marshal(v) - if !bytes.Equal(b64pub, out) { - t.Errorf("want %v, got %v", b64pub, out) + if !bytes.Equal(raw, out) { + t.Errorf("want %v, got %v", raw, out) } } func TestUnmarshalEnc(t *testing.T) { - b64enc := []byte(`RWRCSwAAAACzJBN2gC5//jVvDiV76rs4m2aKXkljqDpbOC0bBf7abZhV/Zygr6b0KIbSI56JQutwzsQeouxnnHuVTZp3IW4M9qdpe5Nh8Jrr5g7r0rHLPxEPmcv/dNru6ZjqI7CcGsY=`) + raw, err := decode(`RWRCSwAAAACzJBN2gC5//jVvDiV76rs4m2aKXkljqDpbOC0bBf7abZhV/Zygr6b0KIbSI56JQutwzsQeouxnnHuVTZp3IW4M9qdpe5Nh8Jrr5g7r0rHLPxEPmcv/dNru6ZjqI7CcGsY=`) + if err != nil { + t.Fatal(err) + } v := new(EncKey) - Unmarshal(b64enc, v) + Unmarshal(raw, v) out, _ := Marshal(v) - if !bytes.Equal(b64enc, out) { - t.Errorf("want %v, got %v", b64enc, out) + if !bytes.Equal(raw, out) { + t.Errorf("want %v, got %v", raw, out) } if !v.IsValid(nil) { t.Error("invalid %+v", v) @@ -39,12 +53,15 @@ func TestUnmarshalEnc(t *testing.T) { } func TestUnmarshalKDF(t *testing.T) { - b64enc := []byte(`RWRCSwAAACoXv4r2lp3RYYLEWZRsY+1Z+1mJtEScNBaKdOKcMdhUHrztnf8a4sUNGY19MoV3wX2cyW2Mn1MduKxi9s3Se070TGF0IZG/hH4SKiNUYi+yi1mandWAwmhY3ahIHApigTk=`) + raw, err := decode(`RWRCSwAAACoXv4r2lp3RYYLEWZRsY+1Z+1mJtEScNBaKdOKcMdhUHrztnf8a4sUNGY19MoV3wX2cyW2Mn1MduKxi9s3Se070TGF0IZG/hH4SKiNUYi+yi1mandWAwmhY3ahIHApigTk=`) + if err != nil { + t.Fatal(err) + } v := new(EncKey) - Unmarshal(b64enc, v) + Unmarshal(raw, v) out, _ := Marshal(v) - if !bytes.Equal(b64enc, out) { - t.Errorf("want %v, got %v", b64enc, out) + if !bytes.Equal(raw, out) { + t.Errorf("want %v, got %v", raw, out) } if !v.IsValid([]byte("test")) { t.Errorf("invalid %+v", v) -- cgit v1.2.3