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

Parsing private key almost there

This commit is contained in:
Miek Gieben 2011-01-16 17:43:41 +01:00
parent 8ed6c8a8f4
commit 317b23ceaf
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,5 +1,4 @@
Todo:
Short term:
* NSEC3 - need base32 for Nsec3
* Cleanup the code
* Tsig testing

59
keygen.go
View File

@ -4,6 +4,8 @@ import (
"os"
"big"
"fmt"
"bufio"
"strings"
"strconv"
"crypto/rsa"
"crypto/rand"
@ -109,34 +111,43 @@ func (r *RR_DNSKEY) PrivateKeyString(p PrivateKey) (s string) {
// Read a private key file and create a public key and
// return a private key
func (r *RR_DNSKEY) PrivateKeySetString(s string) (PrivateKey, os.Error) {
func (k *RR_DNSKEY) PrivateKeySetString(s string) (PrivateKey, os.Error) {
p := new(rsa.PrivateKey)
r := bufio.NewReader(strings.NewReader(s))
var left, right string
line, _ := r.ReadBytes('\n')
fmt.Printf("%v\n", string(line))
// Do we care about the order of things?
n, err := fmt.Sscanf(s, "%s %s\n", &left, &right)
n = n
err = err
switch left {
case "Private-key-format:":
if right != "v1.3" {
return nil, &Error{Error: "v1.3 supported"}
for len(line) > 0 {
n, _ := fmt.Sscanf(string(line), "%s %s\n", &left, &right)
if n > 0 {
switch left {
case "Private-key-format:":
if right != "v1.3" {
return nil, &Error{Error: "v1.3 supported"}
}
case "Algorithm:":
// simple switch on the string
case "Modulus:", "PrivateExponent:", "Prime1:", "Prime2:":
v, err := packBase64([]byte(right))
println(left, right)
if err != nil {
return nil, err
}
if right == "Modulus:" { p.PublicKey.N.SetBytes(v) }
if right == "PublicExponent:" { /* p.PublicKey.E */ }
if right == "PrivateExponent:" { p.D.SetBytes(v) }
if right == "Prime1:" { p.P.SetBytes(v) }
if right == "Prime2:" { p.Q.SetBytes(v) }
case "Exponent1:", "Exponent2:", "Coefficient:":
/* not used in Go (yet) */
default:
println("ERR: ", left)
return nil, &Error{Error: "Private key file not recognized"}
}
}
case "Algorithm:":
// simple switch on the string
case "Modulus:":
modulus, err := packBase64([]byte(right))
if err != nil {
return nil, err
}
p.PublicKey.N.SetBytes(modulus)
/*
case "PublicExponent":
publicExponent, err := packBase64([]byte(right))
if err != nil {
return nil,err
}
t.PublicKey.E = int(publicExponent)
*/
line, _ = r.ReadBytes('\n')
}
return p, nil
}

8
parse_test.go
View File

@ -12,7 +12,7 @@ func TestConversion(t *testing.T) {
println(StringToSeconds("2d"))
println(StringToSeconds("1d1d"))
*/
/*
println(SecondsToString(604800)) // 1w
println(SecondsToString(604799)) // 1w-1
println(SecondsToString(86400)) // 1d
@ -21,6 +21,7 @@ func TestConversion(t *testing.T) {
println(SecondsToString(86)) // 1m26
println(SecondsToString(60)) // 1m
println(SecondsToString(59)) // 59
*/
}
func TestPrivateKeyRead(t *testing.T) {
@ -40,10 +41,7 @@ Created: 20101221142359
Publish: 20101221142359
Activate: 20101221142359`
a = a
b := "Private-key-format: v1.3"
k := new(RR_DNSKEY)
p,_ := k.PrivateKeySetString(b)
p,_ := k.PrivateKeySetString(a)
p = p
}