From cbdfe178da985033d15593078cc6b56ae8215a19 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 7 Jan 2016 13:59:20 +0100 Subject: Remove redundancy --- cmd/acme/main.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'cmd') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 666c9b8..370bbf2 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -2,26 +2,15 @@ package main import ( "crypto/rsa" - "crypto/x509" "flag" - "io" "log" "os" - "path" "dim13.org/acme" ) var confName = flag.String("conf", "acme.toml", "configuration file") -func mkdirCreate(fname string, dmode, fmode os.FileMode) (io.WriteCloser, error) { - if err := os.MkdirAll(path.Dir(fname), dmode); err != nil { - return nil, err - } - flags := os.O_WRONLY | os.O_CREATE | os.O_TRUNC - return os.OpenFile(fname, flags, fmode) -} - func chkKey(k PrivKey) (*rsa.PrivateKey, error) { key := k.KeyPath() if k.HasKey() { @@ -32,7 +21,7 @@ func chkKey(k PrivKey) (*rsa.PrivateKey, error) { defer fd.Close() return acme.LoadKey(fd) } else { - fd, err := mkdirCreate(key, 0700, 0600) + fd, err := acme.CreateKeyFile(key) if err != nil { return nil, err } @@ -41,16 +30,6 @@ func chkKey(k PrivKey) (*rsa.PrivateKey, error) { } } -func saveCert(k Cert, crt []*x509.Certificate) error { - cert := k.CertPath() - fd, err := mkdirCreate(cert, 0755, 0644) - if err != nil { - return err - } - defer fd.Close() - return acme.SaveCert(fd, crt) -} - func main() { flag.Parse() conf, err := LoadConfig(*confName) -- cgit v1.2.3