From 42fd7f9f078aede87980781345d391256b184a32 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 6 Mar 2016 02:52:52 +0100 Subject: Export cert --- certificate.go | 4 ++-- cmd/acme/main.go | 2 +- desire.go | 13 ++----------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/certificate.go b/certificate.go index 5a9c560..318f8bb 100644 --- a/certificate.go +++ b/certificate.go @@ -6,7 +6,7 @@ type CSR struct { } func (p *Provider) Bundle(s Signer, d *Desire) error { - csr, err := NewCSR(d.cert, d.altnames) + csr, err := NewCSR(d.Cert, d.altnames) if err != nil { return err } @@ -18,7 +18,7 @@ func (p *Provider) Bundle(s Signer, d *Desire) error { if err != nil { return err } - d.cert.Certificate = [][]byte{crt, ca} + d.Cert.Certificate = [][]byte{crt, ca} return nil } diff --git a/cmd/acme/main.go b/cmd/acme/main.go index f96ddde..45ceb7b 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -97,7 +97,7 @@ func main() { } log.Println("Save", v.CrtFile, v.KeyFile) - if err := v.Save(des.Cert()); err != nil { + if err := v.Save(des.Cert); err != nil { log.Fatal(err) } } diff --git a/desire.go b/desire.go index 3bcf1a1..5b05a99 100644 --- a/desire.go +++ b/desire.go @@ -3,7 +3,7 @@ package acme import "crypto/tls" type Desire struct { - cert tls.Certificate + Cert tls.Certificate altnames []string solver map[ChalType]Solver } @@ -14,7 +14,7 @@ func NewDesire(altnames []string, size int) (*Desire, error) { return nil, err } return &Desire{ - cert: tls.Certificate{PrivateKey: key}, + Cert: tls.Certificate{PrivateKey: key}, altnames: altnames, solver: make(map[ChalType]Solver), }, nil @@ -27,12 +27,3 @@ func (d *Desire) RegisterSolver(s Solver) { func (d *Desire) HasSolver() bool { return len(d.solver) > 0 } - -func (d *Desire) LoadKeyPair(certFile, keyFile string) (err error) { - d.cert, err = tls.LoadX509KeyPair(certFile, keyFile) - return -} - -func (d *Desire) Cert() tls.Certificate { - return d.cert -} -- cgit v1.2.3