2 files changed, 19 insertions, 16 deletions
diff --git a/ethcrypto/crypto.go b/ethcrypto/crypto.go
index 19f8c9e55..1f500f2db 100644
--- a/ethcrypto/crypto.go
+++ b/ethcrypto/crypto.go
@@ -1,25 +1,11 @@
 package ethcrypto
 
 import (
-	"code.google.com/p/go.crypto/ripemd160"
-	"code.google.com/p/go.crypto/sha3"
-	"crypto/sha256"
+	//"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.NewKeccak256()
 	d.Write(data)
diff --git a/ethcrypto/crypto_test.go b/ethcrypto/crypto_test.go
new file mode 100644
index 000000000..7323e1646
--- /dev/null
+++ b/ethcrypto/crypto_test.go
@@ -0,0 +1,17 @@
+package ethcrypto
+
+import (
+	"bytes"
+	"testing"
+
+	"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"))
+	if bytes.Compare(sha3_256, ethutil.Hex2Bytes(exp)) != 0 {
+		t.Errorf("Sha3_256 failed. Incorrect result %x", sha3_256)
+	}
+}