From 872dc4fc6baaa9e9f4a5907f047e1cb9ea24aad1 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sun, 15 Apr 2012 20:55:25 +0200 Subject: [PATCH] Make the private key reading more natural --- dnssec_test.go | 6 +++--- parse_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dnssec_test.go b/dnssec_test.go index bbede0a2..be03c4ae 100644 --- a/dnssec_test.go +++ b/dnssec_test.go @@ -166,10 +166,10 @@ func TestSignVerify(t *testing.T) { } func TestDnskey(t *testing.T) { - f, _ = os.Open("t/Kmiek.nl.+010+05240.key") + f, _ := os.Open("t/Kmiek.nl.+010+05240.key") pubkey, _ := ReadRR(f, "t/Kmiek.nl.+010+05240.key") - f, _ := os.Open("t/Kmiek.nl.+010+05240.private") - privkey, _ := pubkey.(*RR_DNSKEU).ReadPrivateKey(f, "t/Kmiek.nl.+010+05240.private") + f, _ = os.Open("t/Kmiek.nl.+010+05240.private") + privkey, _ := pubkey.(*RR_DNSKEY).ReadPrivateKey(f, "t/Kmiek.nl.+010+05240.private") // Okay, we assume this has gone OK if pubkey.(*RR_DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" { t.Log("Pubkey is not what we've read") diff --git a/parse_test.go b/parse_test.go index a7dc7540..3d22ca07 100644 --- a/parse_test.go +++ b/parse_test.go @@ -28,7 +28,7 @@ Activate: 20110302104537` xk, _ := NewRR(pub) k := xk.(*RR_DNSKEY) - p, err := ReadPrivateKey(strings.NewReader(priv), "") + p, err := k.NewPrivateKey(priv) if err != nil { t.Logf("%v\n", err) t.Fail() @@ -88,7 +88,7 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR` if err != nil { t.Fatal(err.Error()) } - privkey, err := eckey.(RR_DNSKEY).NewPrivateKey(strings.NewReader(priv), "") + privkey, err := eckey.(*RR_DNSKEY).NewPrivateKey(priv) if err != nil { t.Fatal(err.Error()) }