From d0f659f5d90b76ac163022f7b3afea5112166e4d Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 19 Jul 2017 13:05:18 +0200 Subject: Add new alg --- chksum/chksum.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'chksum/chksum.go') diff --git a/chksum/chksum.go b/chksum/chksum.go index a1e23cb..9d5d239 100644 --- a/chksum/chksum.go +++ b/chksum/chksum.go @@ -12,6 +12,7 @@ import ( "errors" "hash" "io" + "log" "os" "path" "regexp" @@ -38,10 +39,11 @@ type Checksum struct { type Checklist []Checksum var hashes = map[string]func() hash.Hash{ - "SHA512": sha512.New, - "SHA256": sha256.New, - "SHA1": sha1.New, - "MD5": md5.New, + "SHA512/256": sha512.New512_256, + "SHA512": sha512.New, + "SHA256": sha256.New, + "SHA1": sha1.New, + "MD5": md5.New, } func ParseFile(fname string) (Checklist, error) { @@ -58,7 +60,7 @@ func Parse(data []byte) (Checklist, error) { return parse(r) } -var line = regexp.MustCompile(`(\w+) \(([^)]+)\) = (\w+)`) +var line = regexp.MustCompile(`(\S+) \(([^)]+)\) = (\w+)`) func parse(r io.Reader) (Checklist, error) { var checklist Checklist @@ -70,6 +72,7 @@ func parse(r io.Reader) (Checklist, error) { } hash, ok := hashes[match[1]] if !ok { + log.Println(match) return nil, ErrHashAlg } bytes, err := hex.DecodeString(match[3]) -- cgit v1.2.3