Skip to content

Commit

Permalink
fix: only register one blake2s length
Browse files Browse the repository at this point in the history
We register _codes_ for all lengths, but there's no reason to register _sum_
functions for all lengths. This change means we now correctly return "not
supported" for unsupported lengths".
  • Loading branch information
Stebalien committed May 12, 2020
1 parent 6b39927 commit a2ce4b5
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions sum.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ func Sum(data []byte, code uint64, length int) (Multihash, error) {
return Encode(d, code)
}

func sumBlake2s(data []byte, size int) ([]byte, error) {
if size != 32 {
return nil, fmt.Errorf("unsupported length for blake2s: %d", size)
}
func sumBlake2s32(data []byte, _ int) ([]byte, error) {
d := blake2s.Sum256(data)
return d[:], nil
}
Expand Down Expand Up @@ -198,12 +195,9 @@ func registerNonStdlibHashFuncs() {

// Blake family of hash functions
// BLAKE2S
for c := uint64(BLAKE2S_MIN); c <= BLAKE2S_MAX; c++ {
size := int(c - BLAKE2S_MIN + 1)
RegisterHashFunc(c, func(buf []byte, _ int) ([]byte, error) {
return sumBlake2s(buf, size)
})
}
//
// We only support 32byte (256 bit)
RegisterHashFunc(BLAKE2S_MIN+31, sumBlake2s32)
// BLAKE2B
for c := uint64(BLAKE2B_MIN); c <= BLAKE2B_MAX; c++ {
size := int(c - BLAKE2B_MIN + 1)
Expand Down

0 comments on commit a2ce4b5

Please sign in to comment.