aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desire.go5
-rw-r--r--provider.go7
2 files changed, 6 insertions, 6 deletions
diff --git a/desire.go b/desire.go
index c9f8c40..3b4a1f1 100644
--- a/desire.go
+++ b/desire.go
@@ -1,6 +1,7 @@
package acme
import (
+ "crypto"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
@@ -14,7 +15,7 @@ type smap map[ChallengeType]Solver
type Desire struct {
altnames []string
- key *rsa.PrivateKey
+ key crypto.PrivateKey
cert []*x509.Certificate
solver map[ChallengeType]Solver
webroot string
@@ -81,7 +82,7 @@ func (d *Desire) SaveCert(fname string) error {
return nil
}
-func (d *Desire) newCSR() (string, error) {
+func (d *Desire) CSR() (string, error) {
tmpl := x509.CertificateRequest{
Subject: pkix.Name{CommonName: d.altnames[0]},
}
diff --git a/provider.go b/provider.go
index 34920c9..275e3d7 100644
--- a/provider.go
+++ b/provider.go
@@ -170,7 +170,7 @@ func (p *Provider) solve(s Signer, ch Challenge) error {
return err
}
ns := parseHeader(resp)
- log.Println("poke solver", ch.Type, ch.Token, ka)
+ log.Println("poke solver", ch.Type)
err = ch.Solve(ch.Token, ka)
if err != nil {
return err
@@ -221,12 +221,11 @@ func (p *Provider) Authz(s Signer, d *Desire) error {
}
func (p *Provider) queryStatus(uri string) (bool, error) {
- log.Println("query", uri)
- r := &Challenge{}
resp, err := p.Get(uri)
if err != nil {
return false, err
}
+ r := new(Challenge)
err = parseJson(resp, r)
if err != nil {
return false, err
@@ -240,7 +239,7 @@ func (p *Provider) queryStatus(uri string) (bool, error) {
func (p *Provider) Bundle(s Signer, d *Desire) error {
// first step: post csr
- csr, err := d.newCSR()
+ csr, err := d.CSR()
if err != nil {
return err
}