From 150788fb1e84740a1ef1f543d20b05816006712d Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 29 Feb 2016 20:27:00 +0100 Subject: Use tls.Certificate for internal storage --- desire.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'desire.go') diff --git a/desire.go b/desire.go index f5dde99..4de3b64 100644 --- a/desire.go +++ b/desire.go @@ -1,9 +1,9 @@ package acme import ( - "crypto" "crypto/rand" "crypto/rsa" + "crypto/tls" "crypto/x509" "crypto/x509/pkix" "encoding/base64" @@ -13,8 +13,7 @@ import ( type Desire struct { altnames []string - key crypto.PrivateKey - cert []*x509.Certificate + cert tls.Certificate solver map[ChalType]Solver } @@ -24,7 +23,7 @@ func NewDesire(altnames []string, size int) (*Desire, error) { return nil, err } return &Desire{ - key: key, + cert: tls.Certificate{PrivateKey: key}, altnames: altnames, solver: make(map[ChalType]Solver), }, nil @@ -62,7 +61,7 @@ func (d *Desire) saveKey(fname string) error { return err } defer fd.Close() - return saveKey(fd, d.key) + return saveKey(fd, d.cert.PrivateKey) } func (d *Desire) saveCert(fname string) error { @@ -74,7 +73,7 @@ func (d *Desire) saveCert(fname string) error { return err } defer fd.Close() - for _, crt := range d.cert { + for _, crt := range d.cert.Certificate { if err := saveCert(fd, crt); err != nil { return err } @@ -89,7 +88,7 @@ func (d *Desire) CSR() (string, error) { if len(d.altnames) > 1 { tmpl.DNSNames = d.altnames } - der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, d.key) + der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, d.cert.PrivateKey) if err != nil { return "", err } -- cgit v1.2.3