diff --git a/depends/packages/libsnark.mk b/depends/packages/libsnark.mk deleted file mode 100644 index 895818216..000000000 --- a/depends/packages/libsnark.mk +++ /dev/null @@ -1,32 +0,0 @@ -package=libsnark -$(package)_version=0.1 -$(package)_download_path=https://github.com/MyHush/libsnark/releases/download/v$($(package)_version)-$($(package)_git_commit)/ -$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz -$(package)_download_file=$(package)-$($(package)_git_commit).tar.gz -$(package)_sha256_hash=47478adc2ae88c448dc736d59dfe007de6478e41e88d2d4d2ff4135a17ee6f90 -$(package)_git_commit=3854b20c25e8bc567aab2b558dec84d45f4a3e73 - -$(package)_dependencies=libgmp libsodium - -ifeq ($(build_os),darwin) -define $(package)_set_vars - $(package)_build_env=CC="$($(package)_cc)" CXX="$($(package)_cxx)" - $(package)_build_env+=CXXFLAGS="$($(package)_cxxflags) -DBINARY_OUTPUT -DSTATICLIB -DNO_PT_COMPRESSION=1 " -endef -define $(package)_build_cmds - $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " -endef -else ifeq ($(host_os),mingw32) -define $(package)_build_cmds - CXX="x86_64-w64-mingw32-g++-posix" CXXFLAGS="-DBINARY_OUTPUT -DPTW32_STATIC_LIB -DSTATICLIB -DNO_PT_COMPRESSION=1 -fopenmp" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " -endef -else -define $(package)_build_cmds - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " -endef -endif - - -define $(package)_stage_cmds - $(MAKE) install STATIC=1 DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) CURVE=ALT_BN128 NO_SUPERCOP=1 -endef diff --git a/doc/security-warnings.md b/doc/security-warnings.md index 14d045982..bedaf4474 100644 --- a/doc/security-warnings.md +++ b/doc/security-warnings.md @@ -52,8 +52,7 @@ be able to: - Determine the values of your secret spending keys, as well as which notes you are spending, by observing cache side-channels as you perform a JoinSplit - operation. This is due to probable side-channel leakage in the libsnark - proving machinery. + operation. This is due to probable side-channel leakage in C++. - Determine which notes you own by observing cache side-channel information leakage from the incremental witnesses as they are updated with new notes. diff --git a/qa/hush/full-test-suite.sh b/qa/hush/full-test-suite.sh index 5c048ff9d..c995e10e2 100755 --- a/qa/hush/full-test-suite.sh +++ b/qa/hush/full-test-suite.sh @@ -1,9 +1,7 @@ #!/usr/bin/env python2 # Copyright (c) 2019-2020 The Hush developers # Released under the GPLv3 -# # Execute all of the automated tests related to Hush -# import argparse import os @@ -22,10 +20,7 @@ REPOROOT = os.path.dirname( def repofile(filename): return os.path.join(REPOROOT, filename) - -# # Custom test runners -# RE_RPATH_RUNPATH = re.compile('No RPATH.*No RUNPATH') RE_FORTIFY_AVAILABLE = re.compile('FORTIFY_SOURCE support available.*Yes') @@ -117,11 +112,7 @@ def util_test(): env={'PYTHONPATH': repofile('src/test'), 'srcdir': repofile('src')} ) == 0 - -# # Tests -# - STAGES = [ 'btest', 'gtest', @@ -129,7 +120,6 @@ STAGES = [ 'no-dot-so', 'util-test', 'secp256k1', - 'libsnark', 'univalue', 'rpc', ] @@ -141,16 +131,11 @@ STAGE_COMMANDS = { 'no-dot-so': ensure_no_dot_so_in_depends, 'util-test': util_test, 'secp256k1': ['make', '-C', repofile('src/secp256k1'), 'check'], - 'libsnark': ['make', '-C', repofile('src'), 'libsnark-tests'], 'univalue': ['make', '-C', repofile('src/univalue'), 'check'], 'rpc': [repofile('qa/pull-tester/rpc-tests.sh')], } - -# # Test driver -# - def run_stage(stage): print('Running stage %s' % stage) print('=' * (len(stage) + 14))