aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 01:50:59 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 01:50:59 +0100
commit2728957a55fccf1069db23aa9f6dbab621a255ae (patch)
tree88523b8cf775ca4aba0a2faa99b3daf61c13b88d
parent750ff49897b96edf5e4460ac30d7c1da87eaf4d7 (diff)
Extract altnames from desire
-rw-r--r--certificate.go4
-rw-r--r--cmd/acme/main.go4
-rw-r--r--desire.go12
3 files changed, 9 insertions, 11 deletions
diff --git a/certificate.go b/certificate.go
index 3f985bd..0c5fdcb 100644
--- a/certificate.go
+++ b/certificate.go
@@ -7,9 +7,9 @@ type CSR struct {
CSR string `json:"csr"`
}
-func (p *Provider) Bundle(s Signer, d *Desire) (tls.Certificate, error) {
+func (p *Provider) Bundle(s Signer, d *Desire, altnames []string) (tls.Certificate, error) {
cert := tls.Certificate{PrivateKey: d.key}
- csr, err := NewCSR(d.key, d.altnames)
+ csr, err := NewCSR(d.key, altnames)
if err != nil {
return cert, err
}
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 79bf0c2..83d754c 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -84,7 +84,7 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
}
- des := acme.NewDesire(c.PrivateKey, d.Altnames)
+ des := acme.NewDesire(c.PrivateKey)
if d.Webroot != "" {
des.RegisterSolver(acme.NewWebrootSolver(d.Webroot))
} else {
@@ -100,7 +100,7 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
log.Println("Request bundle for", d.Altnames)
- cert, err := prov.Bundle(acc, des)
+ cert, err := prov.Bundle(acc, des, d.Altnames)
if err != nil {
return err
}
diff --git a/desire.go b/desire.go
index 670aca6..4918a06 100644
--- a/desire.go
+++ b/desire.go
@@ -3,16 +3,14 @@ package acme
import "crypto"
type Desire struct {
- key crypto.PrivateKey
- altnames []string
- solver map[ChalType]Solver
+ key crypto.PrivateKey
+ solver map[ChalType]Solver
}
-func NewDesire(key crypto.PrivateKey, altnames []string) *Desire {
+func NewDesire(key crypto.PrivateKey) *Desire {
return &Desire{
- key: key,
- altnames: altnames,
- solver: make(map[ChalType]Solver),
+ key: key,
+ solver: make(map[ChalType]Solver),
}
}