From cdf62c10fee3253ca0a68f2831530e11477e819a Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 9 Jun 2016 09:08:35 +0200 Subject: Hide signer --- provider.go | 2 +- signer.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/provider.go b/provider.go index bcaae56..afb8566 100644 --- a/provider.go +++ b/provider.go @@ -70,7 +70,7 @@ const ( // DialProvider fetches directory and initializes first nonce func DialProvider(directory string, key crypto.PrivateKey) (*Provider, error) { - sig, err := NewSigner(key) + sig, err := newSigner(key) if err != nil { return nil, err } diff --git a/signer.go b/signer.go index 33a4f4d..61f2aaa 100644 --- a/signer.go +++ b/signer.go @@ -18,8 +18,7 @@ const KeySize = 2048 var ErrNoNonces = errors.New("out of nonces") -// Signer ... -type Signer struct { +type signer struct { jose.Signer nonces chan string } @@ -42,8 +41,8 @@ func Thumbnail(privKey crypto.PrivateKey) (string, error) { return "", ErrKeyType } -func NewSigner(privKey crypto.PrivateKey) (*Signer, error) { - signer := func(crypto.PrivateKey) (jose.Signer, error) { +func newSigner(privKey crypto.PrivateKey) (*signer, error) { + js := func(crypto.PrivateKey) (jose.Signer, error) { switch k := privKey.(type) { case *rsa.PrivateKey: return jose.NewSigner(jose.RS256, k) @@ -52,17 +51,17 @@ func NewSigner(privKey crypto.PrivateKey) (*Signer, error) { } return nil, ErrKeyType } - s, err := signer(privKey) + s, err := js(privKey) if err != nil { return nil, err } - sig := &Signer{Signer: s, nonces: make(chan string, 100)} + sig := &signer{Signer: s, nonces: make(chan string, 100)} sig.SetNonceSource(sig) return sig, nil } // Nonce implements jose nonce provider -func (s Signer) Nonce() (string, error) { +func (s signer) Nonce() (string, error) { select { case nonce := <-s.nonces: return nonce, nil @@ -72,7 +71,7 @@ func (s Signer) Nonce() (string, error) { } // RoundTrip extracts nonces from HTTP response -func (s Signer) RoundTrip(req *http.Request) (*http.Response, error) { +func (s signer) RoundTrip(req *http.Request) (*http.Response, error) { if req.Method == http.MethodPost { body, err := ioutil.ReadAll(req.Body) if err != nil { -- cgit v1.2.3