Backport of luke-jr keccak_hf branch from bitcoin

creativechain · Jul 19, 2017 · fee81c6 · fee81c6
1 parent 034b594
commit fee81c6
Show file tree

Hide file tree

Showing 12 changed files with 4,138 additions and 9 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -259,6 +259,7 @@ libbitcoin_consensus_a_SOURCES = \
   consensus/params.h \
   consensus/validation.h \
   hash.cpp \
+  keccak.cpp \
   hash.h \
   prevector.h \
   primitives/block.cpp \
@@ -275,6 +276,8 @@ libbitcoin_consensus_a_SOURCES = \
   script/script_error.cpp \
   script/script_error.h \
   serialize.h \
+  sph_types.h \
+  sph_keccak.h \
   tinyformat.h \
   uint256.cpp \
   uint256.h \

diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
@@ -8,6 +8,9 @@
 
 #include <stdint.h>
 
+// 2017 Jul 20 00:57:36 UTC
+static const uint32_t KECCAK_TIME = 0x59700000;
+
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
 static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
 /** The maximum allowed weight for a block, see BIP 141 (network rule) */