Skip to content

Commit

Permalink
Updated to latest sha3 implementation. Fixes ethereum#48
Browse files Browse the repository at this point in the history
  • Loading branch information
obscuren committed Sep 7, 2014
1 parent 6afc163 commit 627b7c9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ethcrypto/crypto.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package ethcrypto

import (
"crypto/sha256"

"code.google.com/p/go.crypto/ripemd160"
"code.google.com/p/go.crypto/sha3"
"crypto/sha256"
"github.com/ethereum/eth-go/ethutil"
)

Expand All @@ -21,7 +22,7 @@ func Ripemd160(data []byte) []byte {
}

func Sha3Bin(data []byte) []byte {
d := sha3.NewKeccak256()
d := sha3.New256()
d.Write(data)

return d.Sum(nil)
Expand Down
16 changes: 16 additions & 0 deletions ethcrypto/crypto_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package ethcrypto

import (
"bytes"
"testing"

"github.com/ethereum/eth-go/ethutil"
)

func TestSha3(t *testing.T) {
const exp = "3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532"
sha3_256 := Sha3Bin([]byte("abc"))
if bytes.Compare(sha3_256, ethutil.Hex2Bytes(exp)) != 0 {
t.Errorf("Sha3_256 failed. Incorrect result %x", sha3_256)
}
}

0 comments on commit 627b7c9

Please sign in to comment.