Update original Muhash PR and fix benchmarks

Author: fjahr

src/bench/crypto_hash.cpp

@@ -97,11 +97,10 @@ static void MuHash(benchmark::State& state)
     FastRandomContext rng(true);
     MuHash3072 acc;
     unsigned char key[32] = {0};
+    int i = 0;
     while (state.KeepRunning()) {
-        for (int i = 0; i < 1000; i++) {
-            key[0] = i;
-            acc *= MuHash3072(key);
-        }
+        key[0] = ++i;
+        acc *= MuHash3072(key);
     }
 }
 
@@ -116,4 +115,4 @@ BENCHMARK(SHA256D64_1024, 7400);
 BENCHMARK(FastRandom_32bit, 110 * 1000 * 1000);
 BENCHMARK(FastRandom_1bit, 440 * 1000 * 1000);
 
-BENCHMARK(MuHash);
+BENCHMARK(MuHash, 5000);

src/crypto/muhash.cpp

@@ -2,15 +2,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "muhash.h"
+#include <crypto/muhash.h>
 
-#include <limits>
-#include "common.h"
-#include "chacha20.h"
+#include <crypto/common.h>
+#include <crypto/chacha20.h>
 
 #include <assert.h>
 #include <stdio.h>
 
+#include <limits>
+
 namespace {
 
 /** Extract the lowest limb of [c0,c1,c2] into n, and left shift the number by 1 limb. */
@@ -286,7 +287,7 @@ MuHash3072::MuHash3072() noexcept
 MuHash3072::MuHash3072(const unsigned char* key32) noexcept
 {
     unsigned char tmp[384];
-    ChaCha20(key32, 32).Output(tmp, 384);
+    ChaCha20(key32, 32).Keystream(tmp, 384);
     for (int i = 0; i < Num3072::LIMBS; ++i) {
         if (sizeof(Num3072::limb_type) == 4) {
             data.limbs[i] = ReadLE32(tmp + 4 * i);

src/crypto/muhash.h

@@ -6,7 +6,7 @@
 #define BITCOIN_CRYPTO_MUHASH_H
 
 #if defined(HAVE_CONFIG_H)
-#include "bitcoin-config.h"
+#include <bitcoin-config.h>
 #endif
 
 #include <stdint.h>

src/test/crypto_tests.cpp

@@ -763,7 +763,7 @@ BOOST_AUTO_TEST_CASE(muhash_tests)
         unsigned char res[384];
         int table[4];
         for (int i = 0; i < 4; ++i) {
-            table[i] = insecure_rand_ctx.randbits(3);
+            table[i] = g_insecure_rand_ctx.randbits(3);
         }
         for (int order = 0; order < 4; ++order) {
             MuHash3072 acc;
@@ -783,8 +783,8 @@ BOOST_AUTO_TEST_CASE(muhash_tests)
             }
         }
 
-        MuHash3072 x = FromInt(insecure_rand_ctx.randbits(4)); // x=X
-        MuHash3072 y = FromInt(insecure_rand_ctx.randbits(4)); // x=X, y=Y
+        MuHash3072 x = FromInt(g_insecure_rand_ctx.randbits(4)); // x=X
+        MuHash3072 y = FromInt(g_insecure_rand_ctx.randbits(4)); // x=X, y=Y
         MuHash3072 z; // x=X, y=Y, z=1
         z *= x; // x=X, y=Y, z=X
         z /= y; // x=X, y=Y, z=X/Y
@@ -800,7 +800,7 @@ BOOST_AUTO_TEST_CASE(muhash_tests)
     acc *= FromInt(1);
     acc /= FromInt(2);
     acc.Finalize(out);
-    uint256 x = (TruncatedSHA512Writer(SER_DISK, 0) << FLATDATA(out)).GetHash();
+    uint256 x = (TruncatedSHA512Writer(SER_DISK, 0) << out).GetHash();
     BOOST_CHECK(x == uint256S("0e94c56c180f27fd6b182f091c5b007e2d6eba5ae28daa5aa92d2af8c26ea9a6"));
 }