move problematic hash functions to separate file

Makefile

@@ -18,7 +18,7 @@ INCLUDES := -I $(K_RELEASE)/include/kllvm -I $(PREFIX)/include -I dummy-version
 CPPFLAGS += --std=c++14 $(INCLUDES)
 
 .PHONY: build libcryptopp libff libsecp256k1
-build: client-c/json.o client-c/main.o plugin-c/blake2.o plugin-c/blockchain.o plugin-c/crypto.o plugin-c/world.o
+build: client-c/json.o client-c/main.o plugin-c/blake2.o plugin-c/blockchain.o plugin-c/crypto.o plugin-c/plugin_util.o plugin-c/world.o
 
 plugin-c/blockchain.o: plugin/proto/msg.pb.h
 

plugin-c/crypto.cpp

@@ -1,11 +1,8 @@
-#include <cstdint>
-#include <cryptopp/blake2.h>
 #include <cryptopp/keccak.h>
 #include <cryptopp/ripemd.h>
 #include <cryptopp/sha.h>
 #include <cryptopp/sha3.h>
 #include <secp256k1_recovery.h>
-#include <gmp.h>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
 #include <libff/common/profiling.hpp>
 #include "blake2.h"
@@ -30,20 +27,6 @@ struct string *hook_KRYPTO_sha512(struct string *str) {
   return hexEncode(digest, sizeof(digest));
 }
 
-struct string *hook_KRYPTO_blake2b256raw(struct string *str) {
-  BLAKE2b h(false,32);
-  unsigned char digest[32];
-  h.CalculateDigest(digest, (unsigned char *)str->data, len(str));
-  return raw(digest, sizeof(digest));
-}
-
-struct string *hook_KRYPTO_blake2b256(struct string *str) {
-  BLAKE2b h(false,32);
-  unsigned char digest[32];
-  h.CalculateDigest(digest, (unsigned char *)str->data, len(str));
-  return hexEncode(digest, sizeof(digest));
-}
-
 struct string *hook_KRYPTO_sha3raw(struct string *str) {
   SHA3_256 h;
   unsigned char digest[32];

plugin-c/hash_ext.cpp

@@ -0,0 +1,22 @@
+#include <cryptopp/blake2.h>
+#include "plugin_util.h"
+
+using namespace CryptoPP;
+
+extern "C" {
+
+struct string *hook_KRYPTO_blake2b256raw(struct string *str) {
+  BLAKE2b h(false,32);
+  unsigned char digest[32];
+  h.CalculateDigest(digest, (unsigned char *)str->data, len(str));
+  return raw(digest, sizeof(digest));
+}
+
+struct string *hook_KRYPTO_blake2b256(struct string *str) {
+  BLAKE2b h(false,32);
+  unsigned char digest[32];
+  h.CalculateDigest(digest, (unsigned char *)str->data, len(str));
+  return hexEncode(digest, sizeof(digest));
+}
+
+}