Changed back to FIPS 180

2 files changed, 4 insertions, 18 deletions

diff --git a/ethcrypto/crypto.go b/ethcrypto/crypto.go
index f5f0f7e68..1f500f2db 100644
--- a/ethcrypto/crypto.go
+++ b/ethcrypto/crypto.go
@@ -1,28 +1,13 @@
 package ethcrypto
 
 import (
-	"crypto/sha256"
-
-	"code.google.com/p/go.crypto/ripemd160"
-	"code.google.com/p/go.crypto/sha3"
+	//"code.google.com/p/go.crypto/sha3"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/obscuren/sha3"
 )
 
-func Sha256Bin(data []byte) []byte {
-	hash := sha256.Sum256(data)
-
-	return hash[:]
-}
-
-func Ripemd160(data []byte) []byte {
-	ripemd := ripemd160.New()
-	ripemd.Write(data)
-
-	return ripemd.Sum(nil)
-}
-
 func Sha3Bin(data []byte) []byte {
-	d := sha3.New256()
+	d := sha3.NewKeccak256()
 	d.Write(data)
 
 	return d.Sum(nil)
diff --git a/ethcrypto/crypto_test.go b/ethcrypto/crypto_test.go
index 8418c9a5a..7323e1646 100644
--- a/ethcrypto/crypto_test.go
+++ b/ethcrypto/crypto_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum/eth-go/ethutil"
 )
 
+// FIPS 202 test (reverted back to FIPS 180)
 func TestSha3(t *testing.T) {
 	const exp = "3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532"
 	sha3_256 := Sha3Bin([]byte("abc"))