From 0f98266e303f3ec891a491811e89148ae4ac4225 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 4 Mar 2016 00:07:35 +0100 Subject: Revert altnames --- desire.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'desire.go') diff --git a/desire.go b/desire.go index 25c5ebd..4e7392a 100644 --- a/desire.go +++ b/desire.go @@ -10,18 +10,20 @@ import ( ) type Desire struct { - cert tls.Certificate - solver map[ChalType]Solver + cert tls.Certificate + altnames []string + solver map[ChalType]Solver } -func NewDesire(size int) (*Desire, error) { +func NewDesire(altnames []string, size int) (*Desire, error) { key, err := rsa.GenerateKey(rand.Reader, size) if err != nil { return nil, err } return &Desire{ - cert: tls.Certificate{PrivateKey: key}, - solver: make(map[ChalType]Solver), + cert: tls.Certificate{PrivateKey: key}, + altnames: altnames, + solver: make(map[ChalType]Solver), }, nil } @@ -33,12 +35,12 @@ func (d *Desire) HasSolver() bool { return len(d.solver) > 0 } -func (d *Desire) CSR(altnames []string) (string, error) { +func (d *Desire) CSR() (string, error) { tmpl := x509.CertificateRequest{ - Subject: pkix.Name{CommonName: altnames[0]}, + Subject: pkix.Name{CommonName: d.altnames[0]}, } - if len(altnames) > 1 { - tmpl.DNSNames = altnames + if len(d.altnames) > 1 { + tmpl.DNSNames = d.altnames } der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, d.cert.PrivateKey) if err != nil { -- cgit v1.2.3