aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 02:31:21 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 02:31:21 +0100
commit8ced81a42df940b9535fc72bccf70d56516cfade (patch)
tree1735f2f0861ec8bb30ded2c431de8c12bf37c3e9
parent2728957a55fccf1069db23aa9f6dbab621a255ae (diff)
Remove key from desire
-rw-r--r--certificate.go15
-rw-r--r--cmd/acme/main.go4
-rw-r--r--desire.go6
3 files changed, 12 insertions, 13 deletions
diff --git a/certificate.go b/certificate.go
index 0c5fdcb..ada5991 100644
--- a/certificate.go
+++ b/certificate.go
@@ -1,19 +1,22 @@
package acme
-import "crypto/tls"
+import (
+ "crypto"
+ "crypto/tls"
+)
type CSR struct {
Resource Resource `json:"resource"` // new-cert
CSR string `json:"csr"`
}
-func (p *Provider) Bundle(s Signer, d *Desire, altnames []string) (tls.Certificate, error) {
- cert := tls.Certificate{PrivateKey: d.key}
- csr, err := NewCSR(d.key, altnames)
+func (p *Provider) Bundle(s Signer, key crypto.PrivateKey, altnames []string) (tls.Certificate, error) {
+ cert := tls.Certificate{PrivateKey: key}
+ csr, err := NewCSR(key, altnames)
if err != nil {
return cert, err
}
- crt, up, err := p.RequestCert(s, d, csr)
+ crt, up, err := p.RequestCert(s, csr)
if err != nil {
return cert, err
}
@@ -25,7 +28,7 @@ func (p *Provider) Bundle(s Signer, d *Desire, altnames []string) (tls.Certifica
return cert, nil
}
-func (p *Provider) RequestCert(s Signer, d *Desire, csr string) ([]byte, string, error) {
+func (p *Provider) RequestCert(s Signer, csr string) ([]byte, string, error) {
req := &CSR{
Resource: ResNewCert,
CSR: csr,
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 83d754c..cda91e0 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -84,7 +84,7 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
}
- des := acme.NewDesire(c.PrivateKey)
+ des := acme.NewDesire()
if d.Webroot != "" {
des.RegisterSolver(acme.NewWebrootSolver(d.Webroot))
} else {
@@ -100,7 +100,7 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
log.Println("Request bundle for", d.Altnames)
- cert, err := prov.Bundle(acc, des, d.Altnames)
+ cert, err := prov.Bundle(acc, c.PrivateKey, d.Altnames)
if err != nil {
return err
}
diff --git a/desire.go b/desire.go
index 4918a06..e1eb4bc 100644
--- a/desire.go
+++ b/desire.go
@@ -1,15 +1,11 @@
package acme
-import "crypto"
-
type Desire struct {
- key crypto.PrivateKey
solver map[ChalType]Solver
}
-func NewDesire(key crypto.PrivateKey) *Desire {
+func NewDesire() *Desire {
return &Desire{
- key: key,
solver: make(map[ChalType]Solver),
}
}