From 22b6e21cbb304403d8ce9d14060c6a876cf2c0e8 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 1 Mar 2016 14:54:26 +0100 Subject: Cleanup file operations --- desire.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'desire.go') diff --git a/desire.go b/desire.go index 4de3b64..838b59b 100644 --- a/desire.go +++ b/desire.go @@ -7,8 +7,6 @@ import ( "crypto/x509" "crypto/x509/pkix" "encoding/base64" - "os" - "syscall" ) type Desire struct { @@ -37,14 +35,6 @@ func (d *Desire) HasSolver() bool { return len(d.solver) > 0 } -func backup(fname string) error { - err := os.Rename(fname, fname+".bak") - if nerr, ok := err.(*os.LinkError); ok && nerr.Err == syscall.ENOENT { - return nil - } - return err -} - func (d *Desire) Save(cert, key string) error { if err := d.saveKey(key); err != nil { return err @@ -53,22 +43,16 @@ func (d *Desire) Save(cert, key string) error { } func (d *Desire) saveKey(fname string) error { - if err := backup(fname); err != nil { - return err - } - fd, err := CreatePrivFile(fname) + fd, err := CreateFile(fname, 0600) if err != nil { return err } defer fd.Close() - return saveKey(fd, d.cert.PrivateKey) + return SaveKey(fd, d.cert.PrivateKey) } func (d *Desire) saveCert(fname string) error { - if err := backup(fname); err != nil { - return err - } - fd, err := CreatePubFile(fname) + fd, err := CreateFile(fname, 0644) if err != nil { return err } -- cgit v1.2.3