From 3b8e9fb44d3d1c91ab457bffbbf99e433df68312 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 7 Jan 2016 18:37:29 +0100 Subject: Remove old code --- cmd/acme/main.go | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 898536e..f0fb67d 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -1,10 +1,8 @@ package main import ( - "crypto/rsa" "flag" "log" - "os" "sync" "dim13.org/acme" @@ -12,25 +10,6 @@ import ( var confName = flag.String("conf", "acme.toml", "configuration file") -func chkKey(k PrivKey) (*rsa.PrivateKey, error) { - key := k.KeyPath() - if k.HasKey() { - fd, err := os.Open(key) - if err != nil { - return nil, err - } - defer fd.Close() - return acme.LoadKey(fd) - } else { - fd, err := acme.CreateKeyFile(key) - if err != nil { - return nil, err - } - defer fd.Close() - return acme.NewKey(fd, k.KeySize()) - } -} - func main() { flag.Parse() conf, err := LoadConfig(*confName) @@ -49,7 +28,11 @@ func main() { if err != nil { log.Println(err) log.Println("NewAccount", k) - acc.Account, err = acme.NewAccount(acc.Size) + acc.Account, err = acme.NewAccount(acc.KeySize) + if err != nil { + log.Fatal(err) + } + err = acc.Account.SaveKey(acc.Key) if err != nil { log.Fatal(err) } @@ -65,7 +48,7 @@ func main() { go func(k string, des *desire) { defer wg.Done() log.Println("NewDesire", k) - des.Desire, err = acme.NewDesire(des.Altnames, des.Size) + des.Desire, err = acme.NewDesire(des.Altnames, des.KeySize) if err != nil { log.Fatal(err) } @@ -95,7 +78,7 @@ func main() { log.Fatal("register", err) } - d, err := acme.NewDesire(des.Altnames, des.Size) + d, err := acme.NewDesire(des.Altnames, des.KeySize) if err != nil { log.Fatal("newDesire", err) } -- cgit v1.2.3