aboutsummaryrefslogtreecommitdiff
path: root/desire.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-03 20:12:02 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-03 20:12:02 +0100
commit46778cd697a57523574bb1082b612c4db6832de9 (patch)
tree6dd3ca4952fafa5bcc366cde30ee00f4a93d1b80 /desire.go
parentbc7ea1625ac035fd56a1b2d543c33d62529d02c1 (diff)
Remove altnames from desire
Diffstat (limited to 'desire.go')
-rw-r--r--desire.go20
1 files changed, 9 insertions, 11 deletions
diff --git a/desire.go b/desire.go
index 5d85e61..25c5ebd 100644
--- a/desire.go
+++ b/desire.go
@@ -10,20 +10,18 @@ import (
)
type Desire struct {
- altnames []string
- cert tls.Certificate
- solver map[ChalType]Solver
+ cert tls.Certificate
+ solver map[ChalType]Solver
}
-func NewDesire(altnames []string, size int) (*Desire, error) {
+func NewDesire(size int) (*Desire, error) {
key, err := rsa.GenerateKey(rand.Reader, size)
if err != nil {
return nil, err
}
return &Desire{
- cert: tls.Certificate{PrivateKey: key},
- altnames: altnames,
- solver: make(map[ChalType]Solver),
+ cert: tls.Certificate{PrivateKey: key},
+ solver: make(map[ChalType]Solver),
}, nil
}
@@ -35,12 +33,12 @@ func (d *Desire) HasSolver() bool {
return len(d.solver) > 0
}
-func (d *Desire) CSR() (string, error) {
+func (d *Desire) CSR(altnames []string) (string, error) {
tmpl := x509.CertificateRequest{
- Subject: pkix.Name{CommonName: d.altnames[0]},
+ Subject: pkix.Name{CommonName: altnames[0]},
}
- if len(d.altnames) > 1 {
- tmpl.DNSNames = d.altnames
+ if len(altnames) > 1 {
+ tmpl.DNSNames = altnames
}
der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, d.cert.PrivateKey)
if err != nil {