From 14b97b923d25386e068612f94540dc37e21e09d9 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 12 Jan 2016 23:12:51 +0100 Subject: cleanup --- crypto.go | 33 +++++---------------------------- desire.go | 6 ++++-- provider.go | 2 +- 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/crypto.go b/crypto.go index 21e2bb3..a9c8b4c 100644 --- a/crypto.go +++ b/crypto.go @@ -4,8 +4,6 @@ import ( "crypto/rand" "crypto/rsa" "crypto/x509" - "crypto/x509/pkix" - "encoding/base64" "encoding/pem" "io" "io/ioutil" @@ -47,33 +45,12 @@ func SaveKey(w io.Writer, key *rsa.PrivateKey) error { return pem.Encode(w, block) } -func NewCSR(altnames []string, key *rsa.PrivateKey) (string, error) { - tmpl := x509.CertificateRequest{ - Subject: pkix.Name{ - CommonName: altnames[0], - }, - } - if len(altnames) > 1 { - tmpl.DNSNames = altnames - } - der, err := x509.CreateCertificateRequest(rand.Reader, &tmpl, key) - if err != nil { - return "", err - } - return base64.RawURLEncoding.EncodeToString(der), nil -} - -func SaveCert(w io.Writer, crt []*x509.Certificate) error { - for _, c := range crt { - block := &pem.Block{ - Type: "CERTIFICATE", - Bytes: c.Raw, - } - if err := pem.Encode(w, block); err != nil { - return err - } +func SaveCert(w io.Writer, crt *x509.Certificate) error { + block := &pem.Block{ + Type: "CERTIFICATE", + Bytes: crt.Raw, } - return nil + return pem.Encode(w, block) } func LoadCertFile(fname string) ([]*x509.Certificate, error) { diff --git a/desire.go b/desire.go index 6a8cded..c0a6042 100644 --- a/desire.go +++ b/desire.go @@ -55,8 +55,10 @@ func (d *Desire) SaveCert(fname string) error { return err } defer fd.Close() - if err := SaveCert(fd, d.cert); err != nil { - return err + for _, crt := range d.cert { + if err := SaveCert(fd, crt); err != nil { + return err + } } return nil } diff --git a/provider.go b/provider.go index 6174440..c696221 100644 --- a/provider.go +++ b/provider.go @@ -249,7 +249,7 @@ func (p *Provider) queryStatus(url string) (bool, error) { } func (p *Provider) newCert(uri string, s Signer, d *Desire) (*x509.Certificate, nextStep, error) { - csr, err := NewCSR(d.altnames, d.key) + csr, err := d.NewCSR() if err != nil { return nil, nextStep{}, err } -- cgit v1.2.3