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

Fix all exponent issues in rsa keys

This commit is contained in:
Miek Gieben 2011-01-17 18:13:52 +01:00
parent 2041cffcfc
commit ea08cb2d7b
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dnssec.go
View File

@ -444,7 +444,14 @@ func (k *RR_DNSKEY) pubKeyRSA() *rsa.PublicKey {
// Set the public key (the value E and N)
func (k *RR_DNSKEY) setPubKeyRSA(_E int, _N *big.Int) {
println(_N)
buf := exponentToBuf(_E)
buf = append(buf, _N.Bytes()...)
k.PubKey = unpackBase64(buf)
return
}
// Set the public key (the value E and N)
func exponentToBuf(_E int) []byte {
var buf []byte
if _E < 256 {
buf = make([]byte, 2)
@ -458,9 +465,7 @@ func (k *RR_DNSKEY) setPubKeyRSA(_E int, _N *big.Int) {
buf[2] = uint8(len(i.Bytes()))
buf = append(buf, i.Bytes()...)
}
buf = append(buf, _N.Bytes()...)
k.PubKey = unpackBase64(buf)
return
return buf
}
// Map for algorithm names.

24
keygen.go
View File

@ -44,20 +44,7 @@ func (r *RR_DNSKEY) Generate(bits int) (PrivateKey, os.Error) {
if err != nil {
return nil, err
}
keybuf := make([]byte, 2)
if priv.PublicKey.E < 256 {
keybuf[0] = 1
keybuf[1] = uint8(priv.PublicKey.E)
} else {
keybuf[0] = 0
//keybuf[1] = part of length
//keybuf[2] = rest of length
// keybuf[1]+[2] have the length
// keybuf[3:..3+lenght] have exponent
// not implemented
return nil, &Error{Error: "Exponent too large"}
}
keybuf := exponentToBuf(priv.PublicKey.E)
keybuf = append(keybuf, priv.PublicKey.N.Bytes()...)
r.PubKey = unpackBase64(keybuf)
return priv, nil
@ -75,9 +62,12 @@ func (r *RR_DNSKEY) PrivateKeyString(p PrivateKey) (s string) {
case *rsa.PrivateKey:
algorithm := strconv.Itoa(int(r.Algorithm)) + " (" + alg_str[r.Algorithm] + ")"
modulus := unpackBase64(t.PublicKey.N.Bytes())
e := big.NewInt(int64(t.PublicKey.E))
/*
pub := make([]byte, 1)
pub[0] = uint8(t.PublicKey.E) // Todo does not fit with binds 65537 exp!
publicExponent := unpackBase64(pub)
*/
publicExponent := unpackBase64(e.Bytes())
privateExponent := unpackBase64(t.D.Bytes())
prime1 := unpackBase64(t.P.Bytes())
prime2 := unpackBase64(t.Q.Bytes())
@ -142,8 +132,8 @@ func (k *RR_DNSKEY) PrivateKeySetString(s string) (PrivateKey, os.Error) {
p.PublicKey.N = big.NewInt(0)
p.PublicKey.N.SetBytes(v)
}
if left == "PublicExponent:" { /* p.PublicKey.E */
p.PublicKey.E = 3
if left == "PublicExponent:" {
p.PublicKey.E, _ = strconv.Atoi(string(v))
}
if left == "PrivateExponent:" {
p.D = big.NewInt(0)