Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/dnssec, plugin/sign: ed25519 support (#3380)

Browse Source 
* add ed25519 dnskey support

Signed-off-by: Sean Liao <seankhliao@gmail.com>

* fix ed25519 type assertion

Signed-off-by: Sean Liao <seankhliao@gmail.com>

* clean up whitespace

Signed-off-by: Sean Liao <seankhliao@gmail.com>
This commit is contained in:
Sean Liao
2019-10-16 08:32:11 +02:00
committed by Miek Gieben
parent 34ffe2a0a5
commit 9ccc736f68
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/dnssec/dnskey.go
View File

@@ -9,8 +9,9 @@ import (
"time" "time"
"github.com/coredns/coredns/request" "github.com/coredns/coredns/request"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/crypto/ed25519"
) )
// DNSKEY holds a DNSSEC public and private key used for on-the-fly signing. // DNSKEY holds a DNSSEC public and private key used for on-the-fly signing.
@@ -55,6 +56,9 @@ func ParseKeyFile(pubFile, privFile string) (*DNSKEY, error) {
if s, ok := p.(*ecdsa.PrivateKey); ok { if s, ok := p.(*ecdsa.PrivateKey); ok {
return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: s, tag: dk.KeyTag()}, nil return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: s, tag: dk.KeyTag()}, nil
} }
if s, ok := p.(ed25519.PrivateKey); ok {
return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: s, tag: dk.KeyTag()}, nil
}
return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: nil, tag: 0}, errors.New("no private key found") return &DNSKEY{K: dk, D: dk.ToDS(dns.SHA256), s: nil, tag: 0}, errors.New("no private key found")
} }

2
plugin/sign/keys.go
View File

@@ -97,7 +97,7 @@ func readKeyPair(public, private string) (Pair, error) {
switch signer := privkey.(type) { switch signer := privkey.(type) {
case *ecdsa.PrivateKey: case *ecdsa.PrivateKey:
return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil
case *ed25519.PrivateKey: case ed25519.PrivateKey:
return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil
case *rsa.PrivateKey: case *rsa.PrivateKey:
return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil return Pair{Public: dnskey.(*dns.DNSKEY), KeyTag: dnskey.(*dns.DNSKEY).KeyTag(), Private: signer}, nil