mirrors/dns
1
0
Fork 0
mirror of https://github.com/miekg/dns.git synced 2025-10-09 17:01:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add symmetry to the reading of public/private keys

Browse Source 
Add a NewPrivateKey that works on strings and calls ReadPrivateKey
that works on io.Readers.
This commit is contained in:
Miek Gieben 2012-04-15 20:50:53 +02:00
parent a3befb0651
commit b58c604e17
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dnssec.go
View File

@ -407,8 +407,8 @@ func (s *RR_RRSIG) sigBuf() []byte {
return sigbuf return sigbuf
} }
// SetPrivatePublicKey sets the public key in the private key. // setPublicKeyInPrivate sets the public key in the private key.
func (k *RR_DNSKEY) SetPrivatePublicKey(p PrivateKey) bool { func (k *RR_DNSKEY) setPublicKeyInPrivate(p PrivateKey) bool {
switch t := p.(type) { switch t := p.(type) {
case *rsa.PrivateKey: case *rsa.PrivateKey:
// Something - but the // Something - but the

4
dnssec_test.go
View File

@ -166,10 +166,10 @@ func TestSignVerify(t *testing.T) {
} }
func TestDnskey(t *testing.T) { func TestDnskey(t *testing.T) {
f, _ := os.Open("t/Kmiek.nl.+010+05240.private")
privkey, _ := ReadPrivateKey(f, "t/Kmiek.nl.+010+05240.private")
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") 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")
// Okay, we assume this has gone OK // Okay, we assume this has gone OK
if pubkey.(*RR_DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" { if pubkey.(*RR_DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" {
t.Log("Pubkey is not what we've read") t.Log("Pubkey is not what we've read")

33
kscan.go
View File

@ -8,8 +8,16 @@ import (
"strings" "strings"
) )
// ReadPrivateKey reads a private key from the io.Reader q. func (k *RR_DNSKEY) NewPrivateKey(s string) (PrivateKey, error) {
func ReadPrivateKey(q io.Reader, file string) (PrivateKey, error) { if s[len(s)-1] != '\n' { // We need a closing newline
return k.ReadPrivateKey(strings.NewReader(s+"\n"), "")
}
return k.ReadPrivateKey(strings.NewReader(s), "")
}
// NewPrivateKey reads a private key from the io.Reader q. The public key must be
// known, because some cryptographics algorithms embed the public inside the privatekey.
func (k *RR_DNSKEY) ReadPrivateKey(q io.Reader, file string) (PrivateKey, error) {
m, e := parseKey(q, file) m, e := parseKey(q, file)
if m == nil { if m == nil {
return nil, e return nil, e
@ -20,6 +28,7 @@ func ReadPrivateKey(q io.Reader, file string) (PrivateKey, error) {
if m["private-key-format"] != "v1.2" && m["private-key-format"] != "v1.3" { if m["private-key-format"] != "v1.2" && m["private-key-format"] != "v1.3" {
return nil, ErrPrivKey return nil, ErrPrivKey
} }
// TODO(mg): check if the pubkey matches the private key
switch m["algorithm"] { switch m["algorithm"] {
case "1 (RSAMD5)": case "1 (RSAMD5)":
fallthrough fallthrough
@ -30,9 +39,23 @@ func ReadPrivateKey(q io.Reader, file string) (PrivateKey, error) {
case "10 (RSASHA512)": case "10 (RSASHA512)":
fallthrough fallthrough
case "7 (RSASHA1NSEC3SHA1)": case "7 (RSASHA1NSEC3SHA1)":
return readPrivateKeyRSA(m) p, e := readPrivateKeyRSA(m)
case "13 (ECDSAP256SHA256)", "14 (ECDSAP384SHA384)": if e != nil {
return readPrivateKeyECDSA(m) if !k.setPublicKeyInPrivate(p) {
return nil, ErrPrivKey
}
}
return p, e
case "13 (ECDSAP256SHA256)":
fallthrough
case "14 (ECDSAP384SHA384)":
p, e := readPrivateKeyECDSA(m)
if e != nil {
if !k.setPublicKeyInPrivate(p) {
return nil, ErrPrivKey
}
}
return p, e
} }
return nil, ErrPrivKey return nil, ErrPrivKey
} }

5
parse_test.go
View File

@ -88,13 +88,10 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
if err != nil { if err != nil {
t.Fatal(err.Error()) t.Fatal(err.Error())
} }
privkey, err := ReadPrivateKey(strings.NewReader(priv), "") privkey, err := eckey.(RR_DNSKEY).NewPrivateKey(strings.NewReader(priv), "")
if err != nil { if err != nil {
t.Fatal(err.Error()) t.Fatal(err.Error())
} }
// We need to set the pubkey in the private key
eckey.(*RR_DNSKEY).SetPrivatePublicKey(privkey)
ds := eckey.(*RR_DNSKEY).ToDS(SHA384) ds := eckey.(*RR_DNSKEY).ToDS(SHA384)
if ds.KeyTag != 10771 { if ds.KeyTag != 10771 {
t.Fatal("Wrong keytag on DS") t.Fatal("Wrong keytag on DS")