Fixes for weekly.2012-01-20
This commit is contained in:
parent
ff25c3a674
commit
509912d4c4
|
@ -404,14 +404,14 @@ func (k *RR_DNSKEY) pubKeyCurve() *ecdsa.PublicKey {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
var c *elliptic.Curve
|
var c elliptic.Curve
|
||||||
switch k.Algorithm {
|
switch k.Algorithm {
|
||||||
case ECDSAP256SHA256:
|
case ECDSAP256SHA256:
|
||||||
c = elliptic.P256()
|
c = elliptic.P256()
|
||||||
case ECDSAP384SHA384:
|
case ECDSAP384SHA384:
|
||||||
c = elliptic.P384()
|
c = elliptic.P384()
|
||||||
}
|
}
|
||||||
x, y := c.Unmarshal(keybuf)
|
x, y := elliptic.Unmarshal(c,keybuf)
|
||||||
pubkey := new(ecdsa.PublicKey)
|
pubkey := new(ecdsa.PublicKey)
|
||||||
pubkey.X = x
|
pubkey.X = x
|
||||||
pubkey.Y = y
|
pubkey.Y = y
|
||||||
|
|
|
@ -48,7 +48,7 @@ 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 ECDSAP256SHA256, ECDSAP384SHA384:
|
case ECDSAP256SHA256, ECDSAP384SHA384:
|
||||||
var c *elliptic.Curve
|
var c elliptic.Curve
|
||||||
switch r.Algorithm {
|
switch r.Algorithm {
|
||||||
case ECDSAP256SHA256:
|
case ECDSAP256SHA256:
|
||||||
c = elliptic.P256()
|
c = elliptic.P256()
|
||||||
|
|
Loading…
Reference in New Issue