aboutsummaryrefslogtreecommitdiff
path: root/provider.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-30 16:37:30 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-30 16:37:30 +0100
commit4c66399b30a8185bd139de6d5c037d13ab966f18 (patch)
tree1ae0e4c199fead84eb01dcdb656a6c2a1be63432 /provider.go
parente4a260c416fad76abeed2bf6f88e90167983e82d (diff)
minor cleanup
Diffstat (limited to 'provider.go')
-rw-r--r--provider.go13
1 files changed, 5 insertions, 8 deletions
diff --git a/provider.go b/provider.go
index bfc5115..2a10ef1 100644
--- a/provider.go
+++ b/provider.go
@@ -162,6 +162,7 @@ func (p *Provider) solve(s Signer, ch Challenge, sol Solver) error {
return err
}
+ // prepare solver
err = sol.Solve(ch.Token, ka)
if err != nil {
return err
@@ -178,10 +179,7 @@ func (p *Provider) solve(s Signer, ch Challenge, sol Solver) error {
}
ns := parseHeader(resp)
- if err := p.pollStatus(ns.Location); err != nil {
- return err
- }
- return nil
+ return p.pollStatus(ns.Location)
}
func (p *Provider) authz(s Signer, domain string, sol map[ChalType]Solver) error {
@@ -244,6 +242,7 @@ func (p *Provider) pollStatus(uri string) error {
}
func (p *Provider) Bundle(s Signer, d *Desire) error {
+ d.cert = make([]*x509.Certificate, 2)
// first step: post csr
csr, err := d.CSR()
if err != nil {
@@ -257,11 +256,10 @@ func (p *Provider) Bundle(s Signer, d *Desire) error {
if err != nil {
return err
}
- crt, err := parseCert(resp)
+ d.cert[0], err = parseCert(resp)
if err != nil {
return err
}
- d.cert = append(d.cert, crt)
ns := parseHeader(resp)
// second step: cet CA
@@ -269,11 +267,10 @@ func (p *Provider) Bundle(s Signer, d *Desire) error {
if err != nil {
return err
}
- crt, err = parseCert(resp)
+ d.cert[1], err = parseCert(resp)
if err != nil {
return err
}
- d.cert = append(d.cert, crt)
return nil
}