hmac: tidy interface

Author: Snawoot

handler/handler.go

@@ -3,8 +3,6 @@ package handler
 import (
 	"bufio"
 	"bytes"
-	chmac "crypto/hmac"
-	"crypto/sha256"
 	"fmt"
 	"io"
 
@@ -30,7 +28,7 @@ func (a *BasicHMACAuthHandler) Run(input io.Reader, output io.Writer) error {
 	rd := bufio.NewReaderSize(input, bufSize)
 	scanner := proto.NewElasticLineScanner(rd, '\n')
 
-	mac := chmac.New(sha256.New, a.Secret)
+	mac := hmac.NewHasher(a.Secret)
 
 	for scanner.Scan() {
 		parts := bytes.SplitN(scanner.Bytes(), []byte{' '}, 4)

hmac/hmac.go

@@ -2,6 +2,7 @@ package hmac
 
 import (
 	"crypto/hmac"
+	"crypto/sha256"
 	"encoding/base64"
 	"encoding/binary"
 	"hash"
@@ -15,6 +16,10 @@ const (
 
 var hmacSignaturePrefix = []byte(HMACSignaturePrefix)
 
+func NewHasher(secret []byte) hash.Hash {
+	return hmac.New(sha256.New, secret)
+}
+
 func VerifyHMACLoginAndPassword(mac hash.Hash, login, password []byte) bool {
 	buf := make([]byte, base64.RawURLEncoding.DecodedLen(len(password)))
 	n, err := base64.RawURLEncoding.Decode(buf, password)