fix: remove blake hash

reasons for this: it ended up unused, blake2s never worked and the
main reason it was added (implementing argon2) failed as argon2 makes
a weird use of blake internals that isn't portable to 32bits

Makefile

@@ -8,7 +8,7 @@ pwd := $(shell pwd)
 PREFIX ?= /usr/local
 # VERSION is set in src/Makefile
 # Targets to be build in this order
-BUILDS := apply-patches milagro lua54 embed-lua quantum-proof ed25519-donna mimalloc blake2
+BUILDS := apply-patches milagro lua54 embed-lua quantum-proof ed25519-donna mimalloc
 
 # DESTDIR is supported by install target
 
@@ -163,14 +163,6 @@ ed25519-donna:
  LDFLAGS="${ldflags}" \
  $(MAKE) -C ${pwd}/lib/ed25519-donna
 
-blake2:
- $(info -- Building Blake2 hash)
- CC="${blake2_cc}" \
- AR=${ar} \
- CFLAGS="${cflags}" \
- LDFLAGS="${ldflags}" \
- $(MAKE) -C ${pwd}/lib/blake2
-
 # -------------------
 # Test suites for all platforms
 include ${pwd}/build/tests.mk
@@ -198,7 +190,6 @@ clean:
  $(MAKE) clean -C ${pwd}/lib/pqclean
  rm -rf ${pwd}/lib/milagro-crypto-c/build
  rm -rf ${pwd}/lib/mimalloc/build
- $(MAKE) clean -C ${pwd}/lib/blake2
  $(MAKE) clean -C ${pwd}/src
  if [ -d "bindings" ]; then $(MAKE) clean -C ${pwd}/bindings; fi
  rm -f ${extras}/index.*

bindings/python3/setup.py

@@ -14,7 +14,6 @@
 MILAGRO_INCLUDE_DIR = os.path.join(ZENROOM_ROOT, 'lib/milagro-crypto-c/include')
 QP_ROOT = os.path.join(ZENROOM_ROOT, 'lib/pqclean')
 ED25519_INCLUDE_DIR = os.path.join(ZENROOM_ROOT, 'lib/ed25519-donna')
-BLAKE2_INCLUDE_DIR = os.path.join(ZENROOM_ROOT, 'lib/blake2')
 MIMALLOC_INCLUDE_DIR = os.path.join(ZENROOM_ROOT, 'lib/mimalloc/include')
 
 def get_versions():
@@ -86,7 +85,6 @@ def get_versions():
  LUA_ROOT,
  MILAGRO_INCLUDE_DIR,
  ED25519_INCLUDE_DIR,
- BLAKE2_INCLUDE_DIR,
  MIMALLOC_INCLUDE_DIR,
  os.path.join(meson_root, 'milagro-crypto-c/include'),
  os.path.join(meson_root, 'milagro-crypto-c/include'),
@@ -110,7 +108,6 @@ def get_versions():
  os.path.join(meson_root, 'libqpz.a'),
  os.path.join(meson_root, 'liblua.a'),
  os.path.join(meson_root, 'libed25519.a'),
- os.path.join(meson_root, 'libblake2.a'),
  os.path.join(meson_root, 'libmimalloc-static.a'),
  ],
  extra_link_args=['-lm']

bindings/rust/build.rs

@@ -13,7 +13,6 @@ fn main() {
  println!("cargo:rustc-link-lib=static=amcl_curve_SECP256K1");
  println!("cargo:rustc-link-lib=static=amcl_pairing_BLS381");
  println!("cargo:rustc-link-lib=static=ed25519");
- println!("cargo:rustc-link-lib=static=blake2");
  println!("cargo:rustc-link-lib=static=mimalloc-static");
  println!("cargo:rustc-link-search=native=clib");
 

build/config.mk

@@ -20,7 +20,6 @@ ldadd += ${milib}/libamcl_curve_${ecdh_curve}.a
 ldadd += ${milib}/libamcl_core.a
 ldadd += ${pwd}/lib/pqclean/libqpz.a
 ldadd += ${pwd}/lib/ed25519-donna/libed25519.a
-ldadd += ${pwd}/lib/blake2/libblake2.a
 ldadd += ${pwd}/lib/mimalloc/build/libmimalloc-static.a
 
 # ----------------
@@ -314,10 +313,6 @@ quantum_proof_cflags ?= -I ${pwd}/src -I ${pwd}/lib/mimalloc/include -I.
 # ed25519 settings
 ed25519_cc ?= ${gcc}
 
-#-----------------
-# blake2 settings
-blake2_cc ?= ${gcc}
-
 #-----------------
 # mimalloc settings
 mimalloc_cmake_flags += -DMI_BUILD_SHARED=OFF -DMI_BUILD_OBJECT=OFF

build/meson.build

@@ -51,7 +51,6 @@ add_project_link_arguments(
  'liblua.a',
  'libqpz.a',
  'libed25519.a',
- 'libblake2.a',
  'libmimalloc-static.a',
  language: 'c'
 )
@@ -68,8 +67,6 @@ lua_include_dirs = include_directories('../lib/lua54/src')
 
 ed25519_include_dirs = include_directories('../lib/ed25519-donna')
 
-blake2_include_dirs = include_directories('../lib/blake2')
-
 zenroom_src = [
  '../src/base58.c',
  '../src/rmd160.c',
@@ -113,7 +110,6 @@ zenroom_lib = library(
  milagro_include_dirs,
  milagro_generated_include_dirs,
  ed25519_include_dirs,
- blake2_include_dirs,
  lua_include_dirs,
  mimalloc_include_dirs,
  ],
@@ -130,7 +126,6 @@ zenroom_dep = declare_dependency(
  milagro_include_dirs,
  milagro_generated_include_dirs,
  ed25519_include_dirs,
- blake2_include_dirs,
  lua_include_dirs,
  mimalloc_include_dirs,
  ],
@@ -176,7 +171,7 @@ endforeach
 ## BATS tests in vectors
 test_dir = meson.source_root() + '/../test/'
 bats_bin = find_program(test_dir+'bats/bin/bats')
-tests = [ 'sha', 'aes', 'hmac', 'blake2' ]
+tests = [ 'sha', 'aes', 'hmac' ]
 foreach test_suite : tests
  test('vectors_'+test_suite.underscorify(),
  bats_bin,

build/meson.mk

@@ -9,7 +9,6 @@ prepare-meson:
  ln -sf ${pwd}/lib/pqclean/libqpz.a ${pwd}/meson/libqpz.a
  ln -sf ${pwd}/lib/lua54/src/liblua.a ${pwd}/meson/liblua.a
  ln -sf ${pwd}/lib/ed25519-donna/libed25519.a ${pwd}/meson/libed25519.a
- ln -sf ${pwd}/lib/blake2/libblake2.a ${pwd}/meson/libblake2.a
  ln -sf ${pwd}/lib/mimalloc/build/libmimalloc-static.a ${pwd}/meson/libmimalloc-static.a
 
 run-meson: