Make the private key reading more natural

This commit is contained in:
Miek Gieben 2012-04-15 20:55:25 +02:00
parent b58c604e17
commit 872dc4fc6b
2 changed files with 5 additions and 5 deletions

View File

@ -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")

View File

@ -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())
}