aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--cmd/acme/main.go4
-rw-r--r--desire.go2
-rw-r--r--provider.go5
4 files changed, 13 insertions, 4 deletions
diff --git a/README.md b/README.md
index b418b52..84c385e 100644
--- a/README.md
+++ b/README.md
@@ -97,3 +97,9 @@ slogin -R \*:80:localhost:8080 -N root@docker.moccu.com
- provider -> nonce
- account -> signer
- desire -> map[domain]signer
+
+# alternative implementations
+
+- github.com/xenolf/lego
+- github.com/ericchiang/letsencrypt
+- github.com/hlandau/acme
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 0dc9fa2..cf6b8bf 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -66,12 +66,12 @@ func satisfice(des *desire) error {
hs := &httpChallenge{Webroot: des.Webroot}
des.RegisterSolver(acme.ChallengeHTTP, hs)
- err = des.provider.Authorize(des.account, des.Desire)
+ err = des.provider.Authz(des.account, des.Desire)
if err != nil {
return err
}
- err = des.provider.Cert(des.account, des.Desire)
+ err = des.provider.Bundle(des.account, des.Desire)
if err != nil {
return err
}
diff --git a/desire.go b/desire.go
index e9eeb6c..c9f8c40 100644
--- a/desire.go
+++ b/desire.go
@@ -10,6 +10,8 @@ import (
"syscall"
)
+type smap map[ChallengeType]Solver
+
type Desire struct {
altnames []string
key *rsa.PrivateKey
diff --git a/provider.go b/provider.go
index d3b945d..2a75059 100644
--- a/provider.go
+++ b/provider.go
@@ -193,7 +193,8 @@ func (p *Provider) solve(s Signer, ch Challenge) error {
return nil
}
-func (p *Provider) Authorize(s Signer, d *Desire) error {
+//func (p *Provider) Authz(s Signer, domain string, sol map[ChallengeType]Solver) error {
+func (p *Provider) Authz(s Signer, d *Desire) error {
for _, domain := range d.altnames {
// first step: pocke
r := &Authorization{
@@ -240,7 +241,7 @@ func (p *Provider) queryStatus(uri string) (bool, error) {
return r.Status == StatusValid, nil
}
-func (p *Provider) Cert(s Signer, d *Desire) error {
+func (p *Provider) Bundle(s Signer, d *Desire) error {
// first step: post csr
csr, err := d.newCSR()
if err != nil {