diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 199914baa4..16bd387c06 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -21,8 +21,7 @@ }, { "ImportPath": "github.com/ethereum/ethash", - "Comment": "v23.1-227-g8f6ccaa", - "Rev": "8f6ccaaef9b418553807a73a95cb5f49cd3ea39f" + "Rev": "227ec953eae56f4f6c7f5e7dc93b4bbebf0cda2e" }, { "ImportPath": "github.com/gizak/termui", @@ -51,7 +50,7 @@ }, { "ImportPath": "github.com/mattn/go-isatty", - "Rev": "fdbe02a1b44e75977b2690062b83cf507d70c013" + "Rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449" }, { "ImportPath": "github.com/mattn/go-runewidth", diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py b/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py old mode 100644 new mode 100755 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h index 6ca6cc0364..e32b1c5398 100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h @@ -35,6 +35,10 @@ #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) #define ethash_swap_u32(input_) bswap32(input_) #define ethash_swap_u64(input_) bswap64(input_) +#elif defined(__OpenBSD__) +#include +#define ethash_swap_u32(input_) swap32(input_) +#define ethash_swap_u64(input_) swap64(input_) #else // posix #include #define ethash_swap_u32(input_) __bswap_32(input_) diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h index d23c4e2474..82cd655c41 100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h @@ -29,6 +29,10 @@ extern "C" { #define FNV_PRIME 0x01000193 +/* The FNV-1 spec multiplies the prime with the input one byte (octet) in turn. + We instead multiply it with the full 32-bit input. + This gives a different result compared to a canonical FNV-1 implementation. +*/ static inline uint32_t fnv_hash(uint32_t const x, uint32_t const y) { return x * FNV_PRIME ^ y; diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh old mode 100644 new mode 100755 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh old mode 100644 new mode 100755 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh old mode 100644 new mode 100755 diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go b/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go index 0352747512..e6282b529a 100644 --- a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go +++ b/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go @@ -1,4 +1,4 @@ -// +build darwin freebsd +// +build darwin freebsd openbsd netbsd package isatty