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

fix the mnemonic for ecdsa*

This commit is contained in:
Miek Gieben 2012-04-11 14:37:51 +02:00
parent a55014ff8a
commit 35bfb48fac
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dnssec.go
View File

@ -45,8 +45,8 @@ const (
RSASHA256 = 8 RSASHA256 = 8
RSASHA512 = 10 RSASHA512 = 10
ECCGOST = 12 ECCGOST = 12
ECDSAP256SHA256Y = 13 ECDSAP256SHA256 = 13
ECDSAP384SHA384Y = 14 ECDSAP384SHA384 = 14
PRIVATEDNS = 253 // Private (experimental keys) PRIVATEDNS = 253 // Private (experimental keys)
PRIVATEOID = 254 PRIVATEOID = 254
) )
@ -248,10 +248,10 @@ func (s *RR_RRSIG) Sign(k PrivateKey, rrset []RR) error {
case RSASHA1, RSASHA1NSEC3SHA1: case RSASHA1, RSASHA1NSEC3SHA1:
h = sha1.New() h = sha1.New()
ch = crypto.SHA1 ch = crypto.SHA1
case RSASHA256, ECDSAP256SHA256Y: case RSASHA256, ECDSAP256SHA256:
h = sha256.New() h = sha256.New()
ch = crypto.SHA256 ch = crypto.SHA256
case ECDSAP384SHA384Y: case ECDSAP384SHA384:
h = sha512.New384() h = sha512.New384()
case RSASHA512: case RSASHA512:
h = sha512.New() h = sha512.New()
@ -442,9 +442,9 @@ func (k *RR_DNSKEY) pubKeyCurve() *ecdsa.PublicKey {
} }
pubkey := new(ecdsa.PublicKey) pubkey := new(ecdsa.PublicKey)
switch k.Algorithm { switch k.Algorithm {
case ECDSAP256SHA256Y: case ECDSAP256SHA256:
pubkey.Curve = elliptic.P256() pubkey.Curve = elliptic.P256()
case ECDSAP384SHA384Y: case ECDSAP384SHA384:
pubkey.Curve = elliptic.P384() pubkey.Curve = elliptic.P384()
} }
pubkey.X = big.NewInt(0) pubkey.X = big.NewInt(0)
@ -617,8 +617,8 @@ var Alg_str = map[uint8]string{
RSASHA256: "RSASHA256", RSASHA256: "RSASHA256",
RSASHA512: "RSASHA512", RSASHA512: "RSASHA512",
ECCGOST: "ECC-GOST", ECCGOST: "ECC-GOST",
ECDSAP256SHA256Y: "ECDSAP256SHA256Y", ECDSAP256SHA256: "ECDSAP256SHA256",
ECDSAP384SHA384Y: "ECDSAP384SHA384Y", ECDSAP384SHA384: "ECDSAP384SHA384",
PRIVATEDNS: "PRIVATEDNS", PRIVATEDNS: "PRIVATEDNS",
PRIVATEOID: "PRIVATEOID", PRIVATEOID: "PRIVATEOID",
} }

10
keygen.go
View File

@ -31,11 +31,11 @@ func (r *RR_DNSKEY) Generate(bits int) (PrivateKey, error) {
if bits < 1024 || bits > 4096 { if bits < 1024 || bits > 4096 {
return nil, ErrKeySize return nil, ErrKeySize
} }
case ECDSAP256SHA256Y: case ECDSAP256SHA256:
if bits != 256 { if bits != 256 {
return nil, ErrKeySize return nil, ErrKeySize
} }
case ECDSAP384SHA384Y: case ECDSAP384SHA384:
if bits != 384 { if bits != 384 {
return nil, ErrKeySize return nil, ErrKeySize
} }
@ -49,12 +49,12 @@ func (r *RR_DNSKEY) Generate(bits int) (PrivateKey, error) {
} }
r.setPublicKeyRSA(priv.PublicKey.E, priv.PublicKey.N) r.setPublicKeyRSA(priv.PublicKey.E, priv.PublicKey.N)
return priv, nil return priv, nil
case ECDSAP256SHA256Y, ECDSAP384SHA384Y: case ECDSAP256SHA256, ECDSAP384SHA384:
var c elliptic.Curve var c elliptic.Curve
switch r.Algorithm { switch r.Algorithm {
case ECDSAP256SHA256Y: case ECDSAP256SHA256:
c = elliptic.P256() c = elliptic.P256()
case ECDSAP384SHA384Y: case ECDSAP384SHA384:
c = elliptic.P384() c = elliptic.P384()
} }
priv, err := ecdsa.GenerateKey(c, rand.Reader) priv, err := ecdsa.GenerateKey(c, rand.Reader)