Update dependencies (#629)

* deps/plugin: update submodule * Add blake2 to make target * Add blake2.cpp to node's cmake list * cmake/client/CMakeLists, krypto: add blake2compress hook * krypto: formatting
runtimeverification · Dec 15, 2019 · 8bbaf04 · 8bbaf04
1 parent d9b0b8d
commit 8bbaf04
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -285,6 +285,7 @@ $(llvm_kompiled): $(llvm_files) $(libff_out)
 	                 --hook-namespaces KRYPTO \
 	                 $(KOMPILE_OPTS) \
 	                 -ccopt $(PLUGIN_SUBMODULE)/plugin-c/crypto.cpp \
+	                 -ccopt $(PLUGIN_SUBMODULE)/plugin-c/blake2.cpp \
 	                 -ccopt -g -ccopt -std=c++14 -ccopt -O2 \
 	                 -ccopt -L$(LIBRARY_PATH) \
 	                 -ccopt -lff -ccopt -lcryptopp -ccopt -lsecp256k1 $(addprefix -ccopt ,$(LINK_PROCPS))

diff --git a/cmake/client/CMakeLists.txt b/cmake/client/CMakeLists.txt
@@ -13,7 +13,8 @@ add_executable(kevm-client
 	$ENV{PLUGIN_SUBMODULE}/client-c/main.cpp
 	$ENV{PLUGIN_SUBMODULE}/client-c/json.cpp
 	$ENV{PLUGIN_SUBMODULE}/client-c/HttpHandler.cpp
-	$ENV{PLUGIN_SUBMODULE}/plugin-c/crypto.cpp)
+	$ENV{PLUGIN_SUBMODULE}/plugin-c/crypto.cpp
+	$ENV{PLUGIN_SUBMODULE}/plugin-c/blake2.cpp)
 
 if(UNIX AND NOT APPLE)
 	set(LINK_PROCPS procps)

diff --git a/cmake/node/CMakeLists.txt b/cmake/node/CMakeLists.txt
@@ -14,6 +14,7 @@ add_executable(kevm-vm
 	$ENV{PLUGIN_SUBMODULE}/vm-c/init.cpp
 	$ENV{PLUGIN_SUBMODULE}/vm-c/main.cpp
 	$ENV{PLUGIN_SUBMODULE}/vm-c/vm.cpp
+	$ENV{PLUGIN_SUBMODULE}/plugin-c/blake2.cpp
 	$ENV{PLUGIN_SUBMODULE}/plugin-c/blockchain.cpp
 	$ENV{PLUGIN_SUBMODULE}/plugin-c/crypto.cpp
 	$ENV{PLUGIN_SUBMODULE}/plugin-c/world.cpp

diff --git a/deps/plugin b/deps/plugin
diff --git a/krypto.md b/krypto.md
@@ -27,7 +27,8 @@ In all functions above, input `String` is interpreted as byte array, e.g. it is
                     | RipEmd160 ( String )                            [function, hook(KRYPTO.ripemd160)]
                     | ECDSASign ( String, String )                    [function, hook(KRYPTO.ecdsaSign)]
                     | ECDSAPubKey ( String )                          [function, hook(KRYPTO.ecdsaPubKey)]
- // ------------------------------------------------------------------------------------------------------
+                    | Blake2Compress ( String )                       [function, hook(KRYPTO.blake2compress)]
+ // ---------------------------------------------------------------------------------------------------------
 ```
 
 The BN128 elliptic curve is defined over 2-dimensional points over the fields of zero- and first-degree polynomials modulo a large prime. (x, y) is a point on G1, whereas (x1 x x2, y1 x y2) is a point on G2, in which x1 and y1 are zero-degree coefficients and x2 and y2 are first-degree coefficients. In each case, (0, 0) is used to represent the point at infinity.
+1 −1		Makefile
+65 −0		plugin-c/blake2.cpp
+6 −0		plugin-c/blake2.h
+19 −0		plugin-c/crypto.cpp