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 --- desire.go | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'desire.go') diff --git a/desire.go b/desire.go index 4e7392a..148523f 100644 --- a/desire.go +++ b/desire.go @@ -2,7 +2,6 @@ package acme import ( "crypto/rand" - "crypto/rsa" "crypto/tls" "crypto/x509" "crypto/x509/pkix" @@ -16,7 +15,7 @@ type Desire struct { } func NewDesire(altnames []string, size int) (*Desire, error) { - key, err := rsa.GenerateKey(rand.Reader, size) + key, err := NewKey(size) if err != nil { return nil, err } @@ -54,32 +53,6 @@ func (d *Desire) LoadKeyPair(certFile, keyFile string) (err error) { return } -func (d *Desire) SaveKeyPair(certFile, keyFile string) error { - if err := d.saveKey(keyFile); err != nil { - return err - } - return d.saveCert(certFile) -} - -func (d *Desire) saveKey(fname string) error { - fd, err := CreateFile(fname, 0600) - if err != nil { - return err - } - defer fd.Close() - return SaveKey(fd, d.cert.PrivateKey) -} - -func (d *Desire) saveCert(fname string) error { - fd, err := CreateFile(fname, 0644) - if err != nil { - return err - } - defer fd.Close() - for _, crt := range d.cert.Certificate { - if err := saveCert(fd, crt); err != nil { - return err - } - } - return nil +func (d *Desire) Cert() tls.Certificate { + return d.cert } -- cgit v1.2.3