From ad78db4d62d392e9462ac4c1f8ac3d9718fdd0fc Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 17 Mar 2015 01:32:35 +0100
Subject: [PATCH] crypto: fix Sha3Hash and add a test for it
---
crypto/crypto.go | 2 +-
crypto/crypto_test.go | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 1f8dfcf32..ec2b41042 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -42,7 +42,7 @@ func Sha3Hash(data ...[]byte) (h common.Hash) {
for _, b := range data {
d.Write(b)
}
- d.Sum(h[:])
+ d.Sum(h[:0])
return h
}
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index 754287641..63a9c3f5e 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -7,8 +7,8 @@ import (
"testing"
"time"
- "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
)
// These tests are sanity checks.
@@ -21,6 +21,12 @@ func TestSha3(t *testing.T) {
checkhash(t, "Sha3-256", func(in []byte) []byte { return Sha3(in) }, msg, exp)
}
+func TestSha3Hash(t *testing.T) {
+ msg := []byte("abc")
+ exp, _ := hex.DecodeString("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
+ checkhash(t, "Sha3-256-array", func(in []byte) []byte { h := Sha3Hash(in); return h[:] }, msg, exp)
+}
+
func TestSha256(t *testing.T) {
msg := []byte("abc")
exp, _ := hex.DecodeString("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
--
GitLab