From cf49d970245fdd871a85c9393a54bdefcbdfc39a Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 6 Mar 2016 02:26:20 +0100 Subject: Move file handling out of the lib --- cmd/acme/main.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 721d204..50855d9 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -41,10 +41,22 @@ func main() { for _, v := range v.Account { log.Println("Load", v.KeyFile) - acc, err := getAccount(v.KeyFile, v.KeySize) + key, err := v.Load() + if err != nil { + key, err = acme.NewKey(v.KeySize) + if err != nil { + log.Fatal(err) + } + } + if err := v.Save(key); err != nil { + log.Fatal(err) + } + + acc, err := acme.NewAccount(key) if err != nil { log.Fatal(err) } + con := acme.Contacts{} con.AddMail(v.Mail) con.AddPhone(v.Phone) @@ -84,21 +96,10 @@ func main() { } log.Println("Save", v.CrtFile, v.KeyFile) - if err := des.SaveKeyPair(v.CrtFile, v.KeyFile); err != nil { + if err := v.Save(des.Cert()); err != nil { log.Fatal(err) } } } } } - -func getAccount(keyFile string, keySize int) (*acme.Account, error) { - acc, err := acme.LoadAccount(keyFile) - if err != nil { - acc, err = acme.NewAccount(keySize) - if err != nil { - return nil, err - } - } - return acc, acc.Save(keyFile) -} -- cgit v1.2.3