community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EC signing

This commit is contained in:
Miek Gieben 2012-04-11 16:09:40 +02:00
parent b1099c10b8
commit 1e1559423d
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dnssec.go
View File

@ -347,7 +347,8 @@ func (s *RR_RRSIG) Verify(k *RR_DNSKEY, rrset []RR) error {
switch s.Algorithm {
case RSASHA1, RSASHA1NSEC3SHA1, RSASHA256, RSASHA512, RSAMD5:
pubkey := k.PubKeyRSA() // Get the key
// TODO(mg): this can be done quicker
pubkey := k.publicKeyRSA() // Get the key
if pubkey == nil {
return ErrKey
}
@ -397,8 +398,23 @@ func (s *RR_RRSIG) sigBuf() []byte {
return sigbuf
}
// PubKeyRSA returns the RSA public key from a DNSKEY record.
func (k *RR_DNSKEY) PubKeyRSA() *rsa.PublicKey {
// SetPrivatePublicKey sets the public key in the private key.
func (k *RR_DNSKEY) SetPrivatePublicKey(p PrivateKey) bool {
switch t := p.(type) {
case *rsa.PrivateKey:
// Something - but the
case *ecdsa.PrivateKey:
x := k.publicKeyCurve()
if x == nil {
return false
}
t.PublicKey = *x
}
return true
}
// publicKeyRSA returns the RSA public key from a DNSKEY record.
func (k *RR_DNSKEY) publicKeyRSA() *rsa.PublicKey {
keybuf, err := packBase64([]byte(k.PublicKey))
if err != nil {
return nil
@ -435,8 +451,8 @@ func (k *RR_DNSKEY) PubKeyRSA() *rsa.PublicKey {
return pubkey
}
// PubKeyCurve returns the Curve public key from the DNSKEY record.
func (k *RR_DNSKEY) PubKeyCurve() *ecdsa.PublicKey {
// publicKeyCurve returns the Curve public key from the DNSKEY record.
func (k *RR_DNSKEY) publicKeyCurve() *ecdsa.PublicKey {
keybuf, err := packBase64([]byte(k.PublicKey))
if err != nil {
return nil

2
parse_test.go
View File

@ -93,7 +93,7 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
t.Fatal(err.Error())
}
// We need to set the pubkey in the private key
privkey.(*ecdsa.PrivateKey).PublicKey = eckey.(*RR_DNSKEY).PubKeyCurve()
eckey.(*RR_DNSKEY).SetPrivatePublicKey(privkey)
ds := eckey.(*RR_DNSKEY).ToDS(SHA384)
if ds.KeyTag != 10771 {