aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/acme/main.go15
-rw-r--r--directory.go13
-rw-r--r--registration.go9
3 files changed, 13 insertions, 24 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index eb83418..43186af 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "flag"
"log"
"dim13.org/acme"
@@ -17,8 +18,14 @@ const (
keySize = 2048
)
+var (
+ server = flag.String("server", acme.LEStaging, "directory server")
+)
+
func main() {
- dir, err := acme.NewDirectory(acme.LEV1)
+ flag.Parse()
+
+ dir, err := acme.NewDirectory(*server)
must(err)
acme.Print(dir)
@@ -27,8 +34,8 @@ func main() {
acme.Print(acc)
//acme.Dump(acc)
- acme.Post(dir.NewReg, acme.NewRegistration(acc.Contact))
+ acme.Post(dir.NewReg, acme.NewRegistration(acc.Contact, acme.NewReg{}))
- s, _ := acme.Sign(acc, []byte("AAA"))
- acme.ParseSigned(s)
+ //s, _ := acme.Sign(acc, []byte("AAA"))
+ //acme.ParseSigned(s)
}
diff --git a/directory.go b/directory.go
index 8dde47e..44062f5 100644
--- a/directory.go
+++ b/directory.go
@@ -1,18 +1,5 @@
package acme
-const (
- LEV1 = `https://acme-v01.api.letsencrypt.org/directory`
- LEStaging = `https://acme-staging.api.letsencrypt.org/directory`
-)
-
-type Directory struct {
- NewReg string `json:"new-reg"`
- RecoverReg string `json:"recover-reg"`
- NewAuthz string `json:"new-authz"`
- NewCert string `json:"new-cert"`
- RevokeCert string `json:"revoke-cert"`
-}
-
func NewDirectory(uri string) (Directory, error) {
var dir Directory
err := Get(uri, &dir)
diff --git a/registration.go b/registration.go
index d0e75d8..1b2baf7 100644
--- a/registration.go
+++ b/registration.go
@@ -1,13 +1,8 @@
package acme
-type Registration struct {
- Resource string `json:"resource"`
- Contact []string `json:"contact"`
-}
-
-func NewRegistration(contact []string) Registration {
+func NewRegistration(contact []string, r ResourceValue) Registration {
return Registration{
- Resource: "new-reg",
+ Resource: r.Value(),
Contact: contact,
}
}