Merge pull request #3 from ethereum/develop

Update to develop

2 files changed, 19 insertions, 0 deletions

diff --git a/pow/dash/crypto.c b/pow/dash/crypto.c
new file mode 100644
index 000000000..9c5a62d16
--- /dev/null
+++ b/pow/dash/crypto.c
@@ -0,0 +1,5 @@
+extern char *Sha3(char *, int);
+char *sha3_cgo(char *data, int l)
+{
+	return Sha3(data, l);
+}
diff --git a/pow/dash/crypto.go b/pow/dash/crypto.go
new file mode 100644
index 000000000..0644a54ae
--- /dev/null
+++ b/pow/dash/crypto.go
@@ -0,0 +1,14 @@
+package dash
+
+/*
+char *sha3_cgo(char *, int); // Forward declaration
+*/
+import "C"
+import (
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+//export Sha3
+func Sha3(data []byte, l int) []byte {
+	return crypto.Sha3(data)
+}