From e7c8224a468b860ff21fa04ad00a3d74a5ea91e7 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 13 Jan 2016 18:41:31 +0100 Subject: Bring parts closer together --- crypto.go | 8 ++++++++ provider.go | 11 +---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crypto.go b/crypto.go index 30b1346..f857a78 100644 --- a/crypto.go +++ b/crypto.go @@ -62,6 +62,14 @@ func LoadCerts(r io.Reader) ([]*x509.Certificate, error) { return x509.ParseCertificates(block.Bytes) } +func readCert(r io.Reader) (*x509.Certificate, error) { + der, err := ioutil.ReadAll(r) + if err != nil { + return nil, err + } + return x509.ParseCertificate(der) +} + func CreatePrivFile(fname string) (io.WriteCloser, error) { return createFile(fname, 0700) } diff --git a/provider.go b/provider.go index 33f3ba6..953f2ad 100644 --- a/provider.go +++ b/provider.go @@ -5,7 +5,6 @@ import ( "encoding/json" "errors" "io" - "io/ioutil" "log" "net/http" "regexp" @@ -136,7 +135,7 @@ func (p *Provider) parseCert(resp *http.Response) (*x509.Certificate, nextStep, case "application/problem+json": return nil, ns, problem(resp.Body) case "application/pkix-cert": - c, err := cert(resp.Body) + c, err := readCert(resp.Body) return c, ns, err } return nil, ns, errContentType @@ -151,14 +150,6 @@ func problem(r io.Reader) error { return p } -func cert(r io.Reader) (*x509.Certificate, error) { - der, err := ioutil.ReadAll(r) - if err != nil { - return nil, err - } - return x509.ParseCertificate(der) -} - func (p *Provider) newReg(uri string, s Signer, c Contacts) (nextStep, error) { r := &Registration{ Resource: ResNewReg, -- cgit v1.2.3