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

Newly allocated names

This commit is contained in:
Miek Gieben 2012-03-02 15:28:22 +01:00
parent 3232814d1b
commit dc16392734
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dnssec.go
View File

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

10
keygen.go
View File

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

4
tsig.go
View File

@ -129,10 +129,10 @@ func TsigGenerate(m *Msg, secret, requestMAC string, timersOnly bool) ([]byte, s
t.TimeSigned = rr.TimeSigned
t.Algorithm = rr.Algorithm
t.OrigId = m.MsgHdr.Id
tbuf := make([]byte, t.Len())
if off, ok := packRR(t, tbuf, 0, nil, false); ok {
tbuf = tbuf[:off] // reset to actual size used
tbuf = tbuf[:off] // reset to actual size used
} else {
return nil, "", ErrPack
}