aboutsummaryrefslogtreecommitdiff
path: root/provider.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-28 13:05:05 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-28 13:05:05 +0100
commitf7d81feed6c1a6f32f064ab03a30c05ba762b061 (patch)
tree211a6a822986cd54ce548216508081da9ed7049f /provider.go
parent8db72aece3d2c01f9304e0faf68b43681cfecc9a (diff)
Rename r into req
Diffstat (limited to 'provider.go')
-rw-r--r--provider.go32
1 files changed, 16 insertions, 16 deletions
diff --git a/provider.go b/provider.go
index 06b5c80..72a3231 100644
--- a/provider.go
+++ b/provider.go
@@ -132,22 +132,22 @@ func parseCert(resp *http.Response) (*x509.Certificate, error) {
func (p *Provider) Register(s Signer, c Contacts) error {
// first step: new-reg
- r := &Registration{
+ req := &Registration{
Resource: ResNewReg,
Contact: c,
}
- resp, err := p.post(p.NewReg, s, r)
+ resp, err := p.post(p.NewReg, s, req)
if err != nil && err.(Problem).Err != ErrMalformed {
return err
}
ns := parseHeader(resp)
// second step: reg, agree to tos
- r = &Registration{
+ req = &Registration{
Resource: ResReg,
Agreement: ns.Link["terms-of-service"],
}
- resp, err = p.post(ns.Location, s, r)
+ resp, err = p.post(ns.Location, s, req)
if err != nil {
return err
}
@@ -185,23 +185,23 @@ func (p *Provider) solve(s Signer, ch Challenge, sol Solver) error {
func (p *Provider) authz(s Signer, domain string, sol map[ChalType]Solver) error {
// first step: pocke
- r := &Authorization{
+ req := &Authorization{
Resource: ResNewAuthz,
Identifier: Identifier{
Type: IdentDNS,
Value: domain,
},
}
- resp, err := p.post(p.NewAuthz, s, r)
+ resp, err := p.post(p.NewAuthz, s, req)
if err != nil {
return err
}
- err = parseJson(resp, r)
+ err = parseJson(resp, req)
if err != nil {
return err
}
// second step: choose and start solver
- for _, ch := range r.Supported(sol) {
+ for _, ch := range req.Supported(sol) {
if err = p.solve(s, ch, sol[ch.Type]); err != nil {
return err
}
@@ -226,16 +226,16 @@ func (p *Provider) pollStatus(uri string) error {
if err != nil {
return err
}
- r := new(Challenge)
- err = parseJson(resp, r)
+ req := new(Challenge)
+ err = parseJson(resp, req)
if err != nil {
return err
}
- if r.Err != nil {
- return r.Err
+ if req.Err != nil {
+ return req.Err
}
- log.Println("status", r.Status)
- if r.Status == StatusValid {
+ log.Println("status", req.Status)
+ if req.Status == StatusValid {
return nil
}
}
@@ -248,11 +248,11 @@ func (p *Provider) Bundle(s Signer, d *Desire) error {
if err != nil {
return err
}
- r := &CSR{
+ req := &CSR{
Resource: ResNewCert,
CSR: csr,
}
- resp, err := p.post(p.NewCert, s, r)
+ resp, err := p.post(p.NewCert, s, req)
if err != nil {
return err
}