aboutsummaryrefslogtreecommitdiff
path: root/desire.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-06 02:26:20 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-06 02:26:20 +0100
commitcf49d970245fdd871a85c9393a54bdefcbdfc39a (patch)
treec793c47b5837c21e1d8c13e7604651f471de6cb7 /desire.go
parent15d5478b1ebbeab7e34ead678d4d963ed736be9a (diff)
Move file handling out of the lib
Diffstat (limited to 'desire.go')
-rw-r--r--desire.go33
1 files changed, 3 insertions, 30 deletions
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
}