From 4c66399b30a8185bd139de6d5c037d13ab966f18 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 30 Jan 2016 16:37:30 +0100 Subject: minor cleanup --- provider.go | 13 +++++-------- 1 file 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 } -- cgit v1.2.3